Merge "[DO NOT MERGE] Migrate clock and lock icon to flows" into tm-qpr-dev am: 1e706ca9ba

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

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