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

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



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