Merge "Add @UnsupportedAppUsage annotations"
am: 5d256870aa

Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a