Merge "Merge "Merge "CTS: Fix issue with StaticMetadataTest#testCapabilities" into lollipop-mr1-cts-dev am: 56126aa03f" into marshmallow-cts-dev am: 3490714a55" into nougat-cts-dev