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

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



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