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: 3fd6d307 am: 5a53b9bb

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



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