[automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf am: 00a78fca41 -s ours
am skip reason: Merged-In Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367 with SHA-1 dc485887cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953
Change-Id: I10e62322818f6859161964d7598d6edbc79cf969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: