Merge changes from topic "atp" into tm-qpr-dev am: e80be01abb am: da800ef537 am: 083ed49f99 am: faa5ec6bfa

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

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