Merge "Merge "Change background color of fold/unfold" into tm-qpr-dev am:...

Merge "Merge "Change background color of fold/unfold" into tm-qpr-dev am: 6230df58 am: c143228d" into udc-dev am: 61de1e2e

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



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