Merge "Merge "Merge "Update App info behavior for mainline module" into...

Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 83578714 am: 14da7dd1" into rvc-d1-dev-plus-aosp am: f9cf45fa" into rvc-qpr-dev-plus-aosp am: b9dfbcdd

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

Change-Id: I0cee878336f86c7d491869374b8c1015d4f27641