Merge "Remove non-existant symbols" into udc-dev am: 0e82fc91 am: e3e475a2

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



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