[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b am: e39fdf0a5f am: aefd8b4e25 am: df46c500d0 am: 18f52a7c83 -s ours

am skip reason: Change-Id Ie1ad6711c490c679ebcfacd97154380a8810ba1c with SHA-1 7197b67343 is in history

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

Change-Id: Ieac74d78d7e6ada488f4051612b0fd00e9f7dda9
tree: 259eccc83341fc1a9d3baefe310e31bcaae7b123
  1. Tethering/