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