[automerger skipped] Merge "Update the use of registerAppInfo" into sc-dev am: dd8b9455 am: 83e844bb -s ours am: 70c4f7d9 -s ours

am skip reason: Merged-In Iae0beab92194d75f191147578922c760f04470b9 with SHA-1 2d2bd54b is already in history

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

Change-Id: I8d5017390ec8c9a4bf8ef7feb9504e1819f37b80