PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,896 Commits 1 Branch 0 Tags
053567b7f97677314c2298bbccf06441434b25f0
Commit Graph

125896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack He
053567b7f9 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 am: a38db8628e am: 9539ac8974 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I104c20b1906403b721cb1128312c7de39b62f8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 03:25:51 +00:00
Jack He
9539ac8974 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 am: a38db8628e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I405e57473de63cb16f7ae2059d75c3db593b69b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:38:33 +00:00
Treehugger Robot
3a43b205e9 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 9a9a6b13f5 am: 972423a2aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Id07efb853df84652fedc8aafb283adf3910ed2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:23:38 +00:00
Treehugger Robot
dd04b84254 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c am: 74375351cb am: a5fff2a551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Iaf2bec8fe46362e3a5e4c29048404bb0629f9fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:22:59 +00:00
Treehugger Robot
4df207fb94 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 14efad99d4 am: 9b6a7daf95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I1fc5446d2dbcbddf1279e82040baf32a7e924fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:22:33 +00:00
Jack He
e64f750f61 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: e188c6c0bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I23d06ed58ed7725bfb1eed931db3ba313291c1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:57:41 +00:00
Jack He
a38db8628e Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I72f712e1996efe37547b14ca2e0c5dd806a49180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:56:57 +00:00
Treehugger Robot
972423a2aa Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 9a9a6b13f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ie857ab16a7a38c6543698e04c0a456c1e8205bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:40:24 +00:00
Treehugger Robot
a5fff2a551 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c am: 74375351cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I6e06d53a8089dc2a9b0a09d76ad2fb37ecd4c019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:38:52 +00:00
Treehugger Robot
9b6a7daf95 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 14efad99d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Icb0f9c343ff90fc5d032da8276640a895407698f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:37:45 +00:00
Becca Hughes
ac2538c321 Fix settings live update am: 481be6dde4 am: f736380002 am: d4c33e36cf am: 05757330df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I766521a74e03b994a643efec5a2becb0c1b1c3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:25:00 +00:00
Becca Hughes
894c1d44ec Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355 am: 10c84dc4a0 am: e4bc3c1918 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I34b9b99f95e337452251face6a87ff124b5e8df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:23:33 +00:00
Guangjie (Jerry) Shi
039d3ea49d Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8 am: 2bf52acd0c am: 706d298584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I8728eb57a6c4af9b4afcb664eb1c2226c7b66021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:22:08 +00:00
Chaohui Wang
9709f6ac77 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496 am: c7ee31956d am: 9ad628f4fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: If0fd086738dd87b7ed6bc6a4f50680290cc7a2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:20:12 +00:00
Becca Hughes
f826df241b Fix settings live update am: 481be6dde4 am: eb5c65a43b am: a85c239613 am: 8641a39b80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Ie118176ce791bd7648216353e656a7e052e824f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:18:26 +00:00
Jack He
e188c6c0bd Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: Iad8cc1c422d29fd5adda2b026eabd8c7f8f4f333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:08 +00:00
Jack He
22e2bd2b85 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:06 +00:00
Treehugger Robot
74375351cb Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I8c7fa00351d7e867e7830e3de70cf15d1b05a874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:54:58 +00:00
Treehugger Robot
9a9a6b13f5 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I5ccdf60696b11fb4258055103381155c3f16a176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:54:36 +00:00
Treehugger Robot
14efad99d4 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ie1f2311d208380d807a52411fcd398d77b61aae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:52:36 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev 
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
 2023-05-06 00:42:40 +00:00
Becca Hughes
05757330df Fix settings live update am: 481be6dde4 am: f736380002 am: d4c33e36cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Iec15d7310b0fc249b8494cdade3f9341e07450bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:36:02 +00:00
Becca Hughes
e4bc3c1918 Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355 am: 10c84dc4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I6e70f50ca955d2049525ac4616f1a0d595d88307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:35:04 +00:00
Guangjie (Jerry) Shi
706d298584 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8 am: 2bf52acd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I09d4cd580feb1382ce7f8ce3a8431ad0e9e3bccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:33:38 +00:00
Chaohui Wang
9ad628f4fc Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496 am: c7ee31956d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I64dea67242931420ce1379add027c1dbf1aea2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:23:08 +00:00
Becca Hughes
8641a39b80 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: a85c239613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Ia8d41eb7c84a38a57eb9ab2af632bdf68d44c172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:17:34 +00:00
Treehugger Robot
e8873adcce Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b91facbb79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ia4158d64795d0f9060ae2984d3de6fa1b1ff870e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:15:24 +00:00
Treehugger Robot
0e8839d15c Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I4dd7fcb722810ecc8a844b5353f3b202b7e9f72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:12:51 +00:00
Treehugger Robot
b492914807 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I45f5fbe9c81c81c111661a33f1c418a604de2977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:12:42 +00:00
Treehugger Robot
b91facbb79 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I5e21736f4ff6c019b9044d5de3b6c9834564aaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:11:14 +00:00
Becca Hughes
67b23f5ec9 Fix settings live update am: 481be6dde4 am: 90f4beed3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: If5f1d79e210f1169644957f59bc0f78813527699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:10:59 +00:00
Becca Hughes
29e62f898e Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784 am: 5e9b4bf2e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Icb7383cefd84ed93a31b7e463093f185ee8497f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:01:25 +00:00
Becca Hughes
d4c33e36cf Fix settings live update am: 481be6dde4 am: f736380002 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I9699ca0f16a48a1069903b333150f95486962f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:01:09 +00:00
Becca Hughes
10c84dc4a0 Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: Ied88bf7e2c846c4b9d6d165da76c9797615b7151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:00:27 +00:00
Vania Januar
97e023a9a8 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 7f65b03c73 am: 8dfae8505d am: 9a94ce4426 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Idaa043b01f17ca1578b71acea072a3683b404ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:59:54 +00:00
Guangjie (Jerry) Shi
2bf52acd0c Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I4e6d2fd92a359a81d9eb1e98defafca8571fb80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:58:58 +00:00
Chaohui Wang
e04f68e768 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: ab3c6d568c am: d4a9230ffb am: 782535b639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I79c4e20fae704cb7c9d10676bef2a06c653987da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:55:57 +00:00
Chaohui Wang
c7ee31956d Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I3f6074a0be4c3c5bb7db43f11428fda8c2d4d9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:54:23 +00:00
Chaohui Wang
ed9ebd9c14 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: fa48499eb6 am: 35245a74b4 am: 3db97d8476 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: I424578cea4f91f0ae6a13f5a9ad219a5d32e1e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:48:14 +00:00
Daniel Huang
5cc9356c50 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: ca5f384333 am: 18df86c7e6 am: a90864b7d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: I343a4d3a24671980ace3759a704f188f350f2107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:45:43 +00:00
Becca Hughes
5e9b4bf2e2 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I0f22afebc2b1930b3d18239cecec98882be22b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:41:36 +00:00
Treehugger Robot
1dc52d159d Merge "Set primary services as enabled" into udc-dev 2023-05-05 23:40:43 +00:00
Vania Januar
9a94ce4426 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 7f65b03c73 am: 8dfae8505d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I7c5dea3e39367912df741f200d349abea04742f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:39:42 +00:00
Bill Yi
bcb299a630 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours am: eb890c8bf8 -s ours am: bdeb587767 -s ours am: bdba9f43ad -s ours am: 7ed65dbcd6 -s ours am: 69ed533776 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d9643508fa6f8dec2e6ae3b471b92bcf5f20071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:38:14 +00:00
Bill Yi
c5ae2824af [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours am: 3f186b6b1c -s ours am: 649fb33ad4 -s ours am: 54f6fc6d11 -s ours am: c654f7fe7b -s ours am: ef9aa836f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice273e7780d029b3a243b79659f10ce1b30ccf8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:37:57 +00:00
Becca Hughes
a85c239613 Fix settings live update am: 481be6dde4 am: eb5c65a43b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I30931cb72a1906baeea0bccfca50deb192a00d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:34:01 +00:00
Chaohui Wang
782535b639 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: ab3c6d568c am: d4a9230ffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: Ic8caf46e961958af20d01ad861143f16b4732229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:32:52 +00:00
Chaohui Wang
3db97d8476 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: fa48499eb6 am: 35245a74b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: Iec8c27381069e10a0d7086df21ce2b62b911d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:28:55 +00:00
Becca Hughes
dd4b33d784 Fix settings live update am: 481be6dde4 am: eb5c65a43b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I43a4d9dd08534bafb9599ece6889629ac9a5b9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:28:14 +00:00
Daniel Huang
a90864b7d9 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: ca5f384333 am: 18df86c7e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: If248e6e1317b1830f7f6531ab2fd853795de1820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:27:25 +00:00