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: I48d913695f95bbf5936a1d3a38560e60adee6cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>