[automerger skipped] Merge "Add non-updatable-api tracking" am: 51aad22d89 am: 94a540dbff -s ours
am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e749775 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324167
Change-Id: Ic2479b2aa43ba67d595399d0413b43fe45f52da0
This commit is contained in: