tree 642b3695818c6d7f268411286b188e4fd5191927
parent 39e322145f0c6b57f03a07b99af8aa6350bddd60
parent 5416ffde4744ea1c92fc429340cd82bd2dbf596b
author TreeHugger Robot <treehugger-gerrit@google.com> 1635300661 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635300661 +0000

Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47

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

Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4