tree e4eabf288ef8975190b887678d48f5f7d91406d7
parent b810aee20fd40632985d201007295ba22d34d99d
parent b985aa2f2930e30218bdd1cf1161453b7e622418
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557348697 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557348697 +0000

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29

Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc