[automerger skipped] Merge "Feature flag for which impl. of...

[automerger skipped] Merge "Feature flag for which impl. of KeyguardBottomArea" into tm-qpr-dev am: 60a06a5b am: 2b50e937 -s ours

am skip reason: Merged-In Ic6c06b047bb5d4b90932dc103a101871f6e4e587 with SHA-1 5d5edfc2 is already in history

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



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