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: ac5a579d

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



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