Merge "ShadeListBuilder clarity refactors" into tm-qpr-dev am: 54217525ea

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

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