Bug: 25540738 Test: added CTS in aosp change #793137 and ran them Change-Id: Ibf870b7e87799090fae9ed456286c11990b01461