Merge "Plumb @TestApi enforcement policy to runtime." am: eb6be3bd48
am: d24444e5ee

Change-Id: If7541ac35b6535a6d5535f777e840aa3da90fa69