Merge "Treat non-existing types as controllable types for compatibility" into udc-dev am: 27a68f38 am: 3fd6d307 am: 5a53b9bb am: 3f68c314

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



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