Merge "Treat non-existing types as controllable types for compatibility" into...

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

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



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