Merge "Add @UnsupportedAppUsage to the old inline APIs for compatibility" into rvc-dev am: c068acb6 am: d5dcaaa6 Change-Id: Ib0f5d0dded0c0a565bb181b12b3fa8a47e3e1823