[automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am:...

[automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: aea7caba am: 86ddc4dc -s ours

am skip reason: Merged-In If2984019e21749a6b5c641e88495f5bd637399ee with SHA-1 3fbc9c34 is already in history

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



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