Merge "Remove sdk extensions from module_lib / system_server api databases" am: f7c8ab4a

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



Change-Id: I7ce58eb4750cc5162c521d10aaccbbdf08636b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>