Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" am: 9c675b0964
am: 1c0e985407

Change-Id: I9fd716be531f1f3acc558812bf6caa9c918782a9