[automerger skipped] Merge "[DO NOT MERGE] Migrate clock and lock icon to...

[automerger skipped] Merge "[DO NOT MERGE] Migrate clock and lock icon to flows" into tm-qpr-dev am: 1e706ca9 am: ebe2684f -s ours

am skip reason: subject contains skip directive

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



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