tree 47d0c47a1f8656c386d926dc3508ee71239eedf1
parent 4828c739312a72e6c07508f4b21dd6f59255335e
parent 57f93997d74408816d11c99fe378416359bd81fd
author Mill Chen <millchen@google.com> 1596535426 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596535426 +0000

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

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

Change-Id: If46dd4f97490ae2e68e03dfddee5885537ca493d