Merge "Do not launch configuration activity if CONFIGURATION_OPTIONAL." into sc-dev am: 27cdff4153

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24b3bdf7e93a4e70ba4c1f19ddde39216146c3c