Merge "Remove unused ITYPEs" into udc-dev am: cbb019f2

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



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