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

Change-Id: Ib451e70ecb98e2e1af635139f23248261385694c