[automerger skipped] Merge "Remove non-existant symbols" into udc-dev am:...

[automerger skipped] Merge "Remove non-existant symbols" into udc-dev am: 0e82fc91 am: e3e475a2 am: 24b5dea8 -s ours am: 6f68362f -s ours

am skip reason: Merged-In I0cc6159d545caf34bdecd39a3c6db734245cde00 with SHA-1 10804ae0 is already in history

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



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