Android CTS 6.0 Release 31 (4890202)
Merge "Snap for 4889949 from d333a47e1fb3cb06df73a80cd495be21cdea61bd to marshmallow-cts-release" into marshmallow-cts-release