Merge "Reset support for themed icons (2/3)." into tm-qpr-dev am: ea078c3f am: 3af7c535

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



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