Merge "Mark CTS-tested APIs as @TestApi" into pi-dev am: 98831af78b
am: d7e4bf0bd4

Change-Id: I705f04feeafe131aa3ce88632e5aa3e56cc3a479