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

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



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