[automerger skipped] Merge "Add non-updatable-api tracking" am: 51aad22d am: 94a540db -s ours am: b08d2b35 -s ours

am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e7497 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324167

Change-Id: I78f77dea0e47de663c84f8cda5346e86f21e0585