Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b

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

Change-Id: I17d06553e949a9f092bad513ec9880b05d1b38e9