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

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

Change-Id: I3362be72460c8830569b7dda470d581b176ea28a