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

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



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