[automerger skipped] Merge "Expose some APIs as test APIs to facilitate CTS" am: 3649374e17 am: ebf53906de
am: 60ace931b3 -s ours
am skip reason: change_id I742f23be57e731307338591d816f7888e198b333 with SHA1 6c14a699e9 is in history

Change-Id: I84e7857f76e36867de5c574e0191d3610ddbab8a