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

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

Change-Id: I820be9993e6aa857cfc2e598477fabd8c793b058