tree e4f0f56d18eb3388fd6097601d7ac6765c8ef78c
parent 2a665430e20628a2a26ce1c7fc8cc0d399410fbb
parent 4b96cb93399b11ec24c54bf40f89617236972ee3
author Arc Wang <arcwang@google.com> 1654305035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654305035 +0000

[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours

am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I5641668bddf5f94f95c0cfa59c7e5c2761bc8c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>