[automerger skipped] Merge "Setting for Lockscreen Clock" into tm-qpr-dev am:...

[automerger skipped] Merge "Setting for Lockscreen Clock" into tm-qpr-dev am: f800b3f5 am: 7435c8c9 -s ours

am skip reason: Merged-In Ia5b4dfe38d48a41cbfb59109c819647b9e8398cf with SHA-1 e3004a6e is already in history

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



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