Android CTS 12.1 Release 2 (8602832)
Snap for 7160059 from 4056291abc17bda6a3944cc7fdb76a7c38c1fad4 to sc-v2-release

Change-Id: I527fa135b36619e29c99455f99583a9a6799ccaa