Merge "Update mainline module utils function of AppUtils" into rvc-dev am: 2db442459a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11824582

Change-Id: Id9d37487ef03923290c18358eabdf554a8d50402