[automerger skipped] Merge "Update the use of registerAppInfo" into sc-dev am: dd8b9455 -s ours am: 0f97b4bd -s ours am: be95cc85 -s ours

am skip reason: Merged-In Iae0beab92194d75f191147578922c760f04470b9 with SHA-1 3e308c62 is already in history

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

Change-Id: I34d81ece9325bb9ca6de93a20539c7fb32054a15