Merge "Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee am: d42b6fa9" into rvc-d1-dev-plus-aosp