Merge changes from topic "clsqa-in-themepicker" into tm-qpr-dev am: c5e1cdf6 am: 729c55cd

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



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