Merge "Add feature flag for widgets on keyguard" into udc-qpr-dev am: eaf79c20

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



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