Merge "Appinfo: Make adb the app debug source of truth" into main am: 9f11cb2610 am: 60507b89fd

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

Change-Id: I7a5f950094161e5a4ec59ef760f7ab071b12ce38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>