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: I0231336512b60cb76764731d3425a7c6e2d30b2f