tree 4c70291baed7c8023f0e2930b620716049eb03f6
parent 18c15a2545bed5de33654e67df096016b95302ca
parent 191136002b203dfd43ddc494928d02e72616ed89
author SongFerng Wang <songferngwang@google.com> 1614863461 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614863461 +0000

Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife74a181399e5c10866b92663f56a2e0077bc9c4