tree 2411c05e25b2a0d44778214625a3199885283b1a
parent 60d8cc727d78954eb04280a948140024e6bea1a2
parent c54d68ea090d65ca43ff47164e4b769498fe164d
author Mill Chen <millchen@google.com> 1596533162 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596533162 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09

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

Change-Id: I68bfa361d10e8a1b56afa414bc570ca87ae6754a