Merge "Check for developer option on resuming settings activity." into sc-dev am: e1d06c5ccd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26ad617681c6aec1154fd33cd5818594f93d1f0b