[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and...

[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" into mainline-prod am: 8e29b7ca -s ours

am skip reason: Change-Id Ie1ad6711c490c679ebcfacd97154380a8810ba1c with SHA-1 41ccbfb4 is in history

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

Change-Id: I16620dd56e687da1a6230bb3ed7512b798822b8c