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

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

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