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: 951b5643 am: de13933e am: 6d83a7dc

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



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