Merge changes from topic "atp" into tm-qpr-dev am: e80be01a am: da800ef5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21563535



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