tree a448cea860c011afbb26a5076d9bf842e1627513
parent e5cf64307b3ff2701f0b9c7f533808f1cb44a5e2
parent e1d06c5ccd553662cac04efbfbded4fda92cde61
author Jonathan Miranda <jonmiranda@google.com> 1614368233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614368233 +0000

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