tree 2411c05e25b2a0d44778214625a3199885283b1a
parent bd78f5d4d3271b57a3d4be05f4297c63cebe4c0c
parent 7bd20e27ab5e5c16fb689313e0da2909dde555b0
author Eugene Susla <eugenesusla@google.com> 1607360746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607360746 +0000

[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138 -s ours am: 7bd20e27ab

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

Change-Id: I0805128072ee688c6ff33e9ab3de25bc693bf077