[automerger skipped] Merge "DeviceConfig for Chooser update-delay duration."...

[automerger skipped] Merge "DeviceConfig for Chooser update-delay duration." into tm-dev am: 31cc9ddb am: 96102fdb -s ours

am skip reason: Merged-In Ia5edfe391b135659d2fd8126069c5cd6ce15653b with SHA-1 944c5af2 is already in history

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



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