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 am: bce53426

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



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