Merge "Merge "Remove obfuscation from clock packages" into udc-qpr-dev am:...

Merge "Merge "Remove obfuscation from clock packages" into udc-qpr-dev am: 77808e6d" into udc-qpr-dev-plus-aosp am: f86b4407

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



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