PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,549 Commits 1 Branch 0 Tags
012fedfa7ab4c36f727ecafb6428e671e57df8cc
Commit Graph

128549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
27b3821313 Add Instant hotspot preference 
- Add Instant hotspot preference to Wi-Fi hotspot settings

- Wait onServiceConnected callback and then getSettingsState

- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings

Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         SharedConnectivityRepositoryTest

Merged-In: I343599e6127d9b1cb4af661dcc80a8683589c7b8
Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
 2023-08-21 12:21:25 +00:00
Zaiyue Xue
9f57691d89 Add UI metrics logging for battery tips card. 
Bug: 291689623
Test: manual
Change-Id: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
Merged-In: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
 2023-08-21 17:40:28 +08:00
Hao Dong
f55c4be4d4 Fix face delete button rotation not working. am: 94f759230a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484929

Change-Id: I97275e1f64fa87f615444870d894e05f386c5eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 20:40:19 +00:00
Bill Yi
75987a1856 Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
Change-Id: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
 2023-08-18 12:17:43 -07:00
Hao Dong
94f759230a Fix face delete button rotation not working. 
Bug: 264503740
Test:  make -j64 RunSettingsRoboTests
      ROBOTEST_FILTER="FaceSettingsRemoveButtonPreferenceControllerTest"

Change-Id: I28a281ca1ed16940400c44272f9fa78f5eb190af
 2023-08-18 18:51:02 +00:00
Andreas Miko
887c955a01 Change nullability of inheriting function of PinPrivacyPreferenceController 
Test: None
Bug: b/292569343
(cherry picked from commit a7d7eb9a16)
(cherry picked from commit 4ca80e6013)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05514d0f4d5b6603da6a79881becb0b768e586a6)
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
 2023-08-18 16:22:17 +00:00
mxyyiyi
851d31df23 Update power_anomaly_event proto fields am: 980116be4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24440948

Change-Id: If97fb080ddead0d37886444e92e1f98e1c235c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 07:30:46 +00:00
mxyyiyi
980116be4d Update power_anomaly_event proto fields 
- add enum PowerAnomalyType/PowerAnomalyKey
- update the func to get anomaly index

Test: manual
Bug: 291689623
Change-Id: If4e6684c8169dfa3edd4e18a11d518737a3b2840
Merged-In: If4e6684c8169dfa3edd4e18a11d518737a3b2840
 2023-08-18 14:10:06 +08:00
Zaiyue Xue
d1a0370ddb Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 1dad0bf856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211971

Change-Id: I5b3b38a62fba34203e0195cdcc510c68f8e12652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:39:34 +00:00
Zaiyue Xue
1dad0bf856 Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev 2023-08-18 02:35:15 +00:00
YK Hung
1b961c35ff Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev am: 1119c81d10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24400415

Change-Id: I81f08d96e2867dd70d031bb7ee4a05756daa33ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:08:40 +00:00
YK Hung
1119c81d10 Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev 2023-08-18 01:35:31 +00:00
Anvesh Renikindi
e81a0072ce [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 am: 5a6d7745d0 -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 4ca80e6013 is already in history

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

Change-Id: I83b30c97b8b21d6eb1d14b238088f0708d8e68a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:34:12 +00:00
Anvesh Renikindi
5a6d7745d0 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787

Change-Id: If307c1d7545d2528aa271a98fc8f236b0d5570bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:14:29 +00:00
Anvesh Renikindi
942e44c0b8 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp 2023-08-17 16:49:52 +00:00
Jeff DeCew
fa4994e1a2 Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286

Change-Id: Ia9daf2b103e562891356bf638bfa097b283add83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:50:31 +00:00
Jeff DeCew
745b7dca9f Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev 2023-08-17 15:35:28 +00:00
Vania Januar
728bf8b8b7 Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427

Change-Id: Ic6326aaf9622027f8347d643b99565165e2b3efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 08:44:37 +00:00
Vania Januar
a928e9202f Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev 2023-08-17 07:50:54 +00:00
mxyyiyi
2037b262ff Impl the detect & show pipeline for PowerAnomalyEventList. 
Test: make SettingsLibRoboTests
Bug: 293813663
Bug: 296322845
Change-Id: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
Merged-In: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
 2023-08-17 06:35:49 +00:00
Treehugger Robot
7e297c494a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 am: fc02a337f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I413aa389f8fee42e7e2d42acb2430034860b170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 23:41:22 +00:00
Treehugger Robot
fc02a337f8 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I32983b0b8ef21c1630b475ec02bd65c8166699b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:56:33 +00:00
Treehugger Robot
47f8568209 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: Ic7d2922b78791b84fd7caaee33e91a2ea35acc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:11:01 +00:00
Treehugger Robot
565161fb1a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: If3767eedff3437224ea7a3864bd48496f392f50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:27:43 +00:00
Treehugger Robot
29ee574493 Merge "Use ArrayMap to cache active subscriptions" into main 2023-08-16 20:39:14 +00:00
Treehugger Robot
2f6fc7155a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: bc55c69e9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7987a08dfd53e9b40c23cda1ee68d0f7c8d2a908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:22:14 +00:00
Bill Yi
05b9ab239f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 3f1da62e96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9feb01e0726ac86eb6e96daa784e66886ab59a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:22:10 +00:00
Treehugger Robot
63353599ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: cd8a489f80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8f1e5a228ef5b76c71cfabacc2f6218c9b96651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:22:01 +00:00
Bill Yi
3d0cc12624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 34a88d2b41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e87a3f836d5744945817cc257d7fd748c17c44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:21:51 +00:00
Bill Yi
d79d7df867 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: f249e4a70a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99370c57d7bf414d488266cd03af4d55e14cf91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:21:33 +00:00
Treehugger Robot
829a488fe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: f53e0c2d9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I138e268689fb473ba84f7dfdccf14e1aad7a60ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:18:31 +00:00
Bill Yi
22041ca1e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: cc1b89c2a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2108aae8724f11d2a8fcc7bfe1ffa49a509da2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:18:27 +00:00
Treehugger Robot
f705cb9c26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 0ed7579d93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7651fc5d40df93de58e353a6d58126b0321d2f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:18:17 +00:00
Bill Yi
fe4af04f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: adec329708 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01c28e0c5d344c90b424af7cc162b4f20172ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:17:58 +00:00
Bill Yi
4ce3453e9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: bb47e1653c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae35e406c13851537fb9fa496423a1a200df9463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:17:48 +00:00
Treehugger Robot
8c89d545a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: c3cd16d5b8 -s ours am: dacbb6472a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I718295a5006809cf55cba9b9f1e61550caf74123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:12:59 +00:00
Bill Yi
bb13b0f059 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 08e62ded38 -s ours am: c0a08d8d80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fbddd4ab5ef3d3894d02a9a9e15ce3ddfe03b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:12:53 +00:00
Treehugger Robot
95878472d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 1b931db3c4 -s ours am: 3e97718152 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b7385a4af440c7991bfc75ecc9dbc849b10d98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:12:46 +00:00
Bill Yi
4a90f9b832 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 7046a1bc58 -s ours am: 7a2398d9c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2db01e98d570385edbfa048e92790b49116af70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:12:37 +00:00
Bill Yi
448f61d46c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: dd6b25ed95 -s ours am: dceba1f16c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I249731d71aa85f67619e50c2e500080609a98b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 19:12:19 +00:00
Treehugger Robot
192b3d2519 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: df335dfd78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56602b47eac7af6dbf88f087493003c9fcb8bff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:56:41 +00:00
Bill Yi
166472f8f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 0341e80c5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787df4ba724f79b2ad1241c96835d7e7f70e7608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:56:37 +00:00
Treehugger Robot
95e165200c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: d751e40eb5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90a99cc994ae057d6f337b399b2408ad3083651c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:56:27 +00:00
Bill Yi
46ccfabc0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 5a56fb9727 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81bad65ed7f65b8ee551f163eb939bff12ff807d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:56:18 +00:00
Bill Yi
6ddc9eebcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: cc4724d018 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98da3f1e3e6ea11a904c752230ed22a6f5a9ac07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:55:59 +00:00
Treehugger Robot
4aa411dd4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: 5152042cef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee6751b39d5444ed6d6fbfbcf7177b509b52e536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:51:49 +00:00
Bill Yi
7c41697bed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: a3c28a2091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16f103b18c8781c4a2e4f58950f93df63a482daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:51:46 +00:00
Treehugger Robot
08d6c6baee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 3838cd44da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I602dfab48db1ea812c2db606f9510a6382b7dcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:51:42 +00:00
Bill Yi
665f49b670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: 891a483a94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2918c9daa28c1beda0567ad56534b2c4e4b48290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:51:25 +00:00
Bill Yi
ee4c57c11c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: c7762b5610 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id47a02c432d6bc2f352971d2658d3d8f4494bdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:51:08 +00:00