Merge "Merge "Update App info behavior for mainline module" into rvc-dev am:...

Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 83578714 am: af13156d" into rvc-d1-dev-plus-aosp am: 348ff2c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I21a0e8816a91715ff5f45272d03f48d2c35aa243