Merge "Passed an extra flag denoting whether assetId is present or not" into udc-qpr-dev am: 63de208b2c am: 233e65db44

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

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