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

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

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



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