[automerger skipped] Merge "DeviceConfig for Chooser update-delay duration." into tm-dev am: 31cc9ddb59 am: ed80533e35 -s ours
am skip reason: Merged-In Ia5edfe391b135659d2fd8126069c5cd6ce15653b with SHA-1 ccb3e7aa51 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17862572
Change-Id: Iae6cc9ef741356ed346f9422df480138a32e9328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: