Merge "Refine fold setting" into udc-qpr-dev am: aea7caba23

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

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