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