Merge "Treat non-existing types as controllable types for compatibility" into udc-dev am: 27a68f38 am: ad449deb am: bce53426 am: d97a6fbe

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



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