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