Merge "Update droidstubs to use the SdkExt info file" am: 3312d073 am:...

Merge "Update droidstubs to use the SdkExt info file" am: 3312d073 am: 74c2f2ab am: d7e5f37d am: d77db87a am: 8c513b58

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



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