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

Change-Id: I7f10bf215c7e9ebc9e483465a839e022bf69ea77