Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda
am: 5cce91a95a

Change-Id: Iab56aa614ff6d910b65bf50327177837dd3fdf1b