Merge mainline-release 6664920 to master - DO NOT MERGE am: d9893cc541

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

Change-Id: I01975717ac17818dc4176929b2a799d4c847ac37