Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d am: 1e085a1db4

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

Change-Id: Ie45f32b2d46c8ac989a4a9242017eb4c2b73484b