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

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



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