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 am: ed1c8128

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

Change-Id: Id9ad1392f66b1efffddb0cb0bcd1152b42303d55