tree 5809df1a67f219e4a7cab96a2e6e0493e826ddac
parent cd7a7d20a108a840212297819f2c75da7fc37a91
parent 20e39131c9f171f7e111f7a24a7176dadcc82aa9
author Treehugger Robot <treehugger-gerrit@google.com> 1613667219 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613667219 +0000

Merge changes I62c58967,I1dd57fa2 am: 20e39131c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae0be639bd6f0a4af5cc108d750c5f77321e6d7