Merge "Update app_api to fix style/lint issues" am: 969ebd2b09 am: 5fb7fcb303

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1373880

Change-Id: Iaf649b1d2999ba84010f0e494222485fda3ceeca