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

[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba18 am: 1e085a1d am: a553a497 am: 42337f43 am: 1ec50946 -s ours

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

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

Change-Id: Ieac74d78d7e6ada488f4051612b0fd00e9f7dda9