Merge "Fix privacy dot not removed issue" into udc-dev am: a82a21c0 am: 61be626c

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



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