[automerger skipped] [DO NOT MERGE] Moving Text Protection to Clock Event Controller am: 417feefd5f am: b115b06197 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19432377 Change-Id: I93e6d568007a3b186360b41ba9527032743979cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: