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

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

Change-Id: I3357a62b499d47ed7af0556d3c22ca16347f3a77