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

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



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