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: 14da7dd1" into rvc-d1-dev-plus-aosp am: f9cf45fa

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

Change-Id: I77d24b536813650f11738e4c78c8fcd759b93f2a