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

128258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu Gupta
8d85607c25 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 am: 783069217f am: 4af03a6f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I9dc519e6dc361df94e342627c92e29c11f8d64e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 23:10:45 +00:00
Himanshu Gupta
40ff85836a Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 am: 40dd0958d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I074ba380be18c1116696b3f0bcb7c3c2ad3a47c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:24:44 +00:00
Himanshu Gupta
86cad961c6 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: 59651f68af am: 29bc3c491f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I46187296224ca51abf6fd0b5ada01710b558f360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:22:55 +00:00
Himanshu Gupta
4af03a6f78 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 am: 783069217f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ie7f04734dbac25664efb106bbd6ba47bb1fca2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:22:39 +00:00
Himanshu Gupta
29bc3c491f Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: 59651f68af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ic1d0bb036477f0246a1c7813255f5053fafecff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:02:18 +00:00
Himanshu Gupta
40dd0958d6 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I6a6b1f0824fefb1ec12cc61dda3c2b550d8fb072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 21:56:28 +00:00
Himanshu Gupta
783069217f Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Id0c01cecf1b24afea3f07a7395217b656a91a512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 21:54:28 +00:00
Daniel Norman
203d362d2d Stops @Ignore-ing a11y robotests. 
Our team is trying to determine the state of our tests in automation,
which is tough to do when some tests are skipped completely.

A11y SettingsRobotests are currently run only in postsubmit, so even
if the Ignored tests fail it should not cause presubmit issues.

Bug: 279082331
Test: Use go/abtd to ensure tests run (and some fail)
Change-Id: I767b25427e748b7e94ab05e81a2f645f8b6279cf
 2023-05-19 21:32:19 +00:00
Himanshu Gupta
59651f68af Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ie4a5bcf554ab4bc20acc00e868c79ac5a54320c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 21:15:21 +00:00
Himanshu Gupta
af793d86f2 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I5afbb8497652ad9e61af90617d0f5ed8e35c8a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 21:12:35 +00:00
Himanshu Gupta
4740720948 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev 2023-05-19 20:28:36 +00:00
Aleksandar Kiridzic
30fd927eba speech: Remove hard-coded preference key from the controllers 
OnDeviceRecognitionPreferenceController and TtsPreferenceController
had their preference keys hard-coded which was breaking
AccessibilitySettingsTest. The key is now left to be read
from the super constructor.

Bug: 283449837
Test: Manual, already existing robotests
Change-Id: Ibe11a2134fffea0a081ca9f5e2f9441911574efa
 2023-05-19 21:11:19 +01:00
Nicolas Sleiman
4302aeb846 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 008a5b24b5 am: 9ddce7322c am: 6fa4152f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I546b985244cac3cca396d22d30274875bca7c900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:07:43 +00:00
Ankita Vyas
10942f202d Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 915741a00d am: 94864ce36d am: 38eb3b4d1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I2e2a41f68d1447115a859cc8311d2c5efe805f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:07:14 +00:00
Nicolas Sleiman
d115e53eff Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 60e25e30e1 am: d422c5a1b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Id9944f40926a12f2fd80bc29847470ea76c7f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:06:50 +00:00
Ankita Vyas
3316abd368 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 2af208be41 am: 6cb3ea6a19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I40d06e399e1a855b5d8225a617e2c3f452935f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:05:59 +00:00
Nicolas Sleiman
2af4a6b1a7 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 122806ad50 am: d8efa40d2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Ie34fee44ed1d4819331dda768df11ffad4565e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:03:31 +00:00
Ankita Vyas
d7f3ef45ac Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 01fca127fb am: fbb0a74bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I844ccf8958bf83d5689e3b5831513aa94aaa7c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:01:59 +00:00
Treehugger Robot
b8562ad63e Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004ee am: bd47587e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379

Change-Id: I0df1f80e08ed37a975676940367ed5a086925556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 17:01:37 +00:00
Nicolas Sleiman
6fa4152f4c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 008a5b24b5 am: 9ddce7322c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Ifeb050cb19fc5e8d2df60ebf1385ee04e1a83464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:55:46 +00:00
Ankita Vyas
38eb3b4d1b Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 915741a00d am: 94864ce36d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I35e0650d865ca1aa662cd33fa58e1db10bc68a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:55:39 +00:00
Nicolas Sleiman
d422c5a1b2 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 60e25e30e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I553522d7f912aa488da9833fa3df2961571c6268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:55:26 +00:00
Ankita Vyas
6cb3ea6a19 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 2af208be41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: Id544df727dc353bea4a9df84702a5a5ea76008be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:54:52 +00:00
Nicolas Sleiman
d8efa40d2c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 122806ad50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Ief3c1ed6340528399883ab09567e2fbe6fd9ee10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:20:24 +00:00
Ankita Vyas
fbb0a74bd3 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 01fca127fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I512cd9e19bab6c4fb08344a4f27bc776b18fe473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:20:09 +00:00
Treehugger Robot
bd47587e8b Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379

Change-Id: I45e4b2f609ced644754410db120e5cd25ad5b6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:18:59 +00:00
Nicolas Sleiman
9ddce7322c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 008a5b24b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I5474df25774da24adf42f2b35d6e46915d1cfb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:18:16 +00:00
Ankita Vyas
94864ce36d Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 915741a00d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I470fbcdb4931159ec9d29ac9649c772f249f64c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:18:08 +00:00
Nicolas Sleiman
122806ad50 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I617fc20bb9ba0c1f2476e3d81acaf8797fb3a15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:17:45 +00:00
Ankita Vyas
01fca127fb Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I8843d39553a68330c6fa69900892ff5fff539e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:17:39 +00:00
Nicolas Sleiman
60e25e30e1 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I616281d105e7c5792b515501970526689bc104ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:13:52 +00:00
Ankita Vyas
2af208be41 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I77f0b8361c02d61941b5cc1c34ffdc79ecef43d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 16:13:27 +00:00
Lex Huang
b9c0368d7a Fix ActivityNotFoundException 
Set intent to preference if intent.resolveActivity is non-null
Set preference selectable to false if no intent set to preference

Fix: 283107867
Test: manual, atest BlockingPrefWithSliceControllerTest
Change-Id: Ib5e8705debb5eb5224d8566215cb65f36613d8f9
 2023-05-19 15:57:18 +00:00
Lucas Silva
9872f4322b Disable dreams home controls button when disabled on lockscreen. 
When home controls are disable on lockscreen, we should also disable
them on dreams.

Bug: 282680621
Test: flashed device, disabled/enabled home controls on lockscreen and
verified that dreams home controls button was hidden/shown correctly
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamHomeControlsPreferenceControllerTest"

Change-Id: I535b079cabc2838e77f3afc74bb8f8730b850653
 2023-05-19 11:46:39 -04:00
Nicolas Sleiman
123fa6ae78 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I47dddd7f1cda8c069584460ecfbf2d94fcfb0684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 15:38:01 +00:00
Nicolas Sleiman
008a5b24b5 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I78483e25ac6fd54ee99295c68a1d1e76a59bad48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 15:37:13 +00:00
Ankita Vyas
915741a00d Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I642beff62fac8c46054c0d35cf2ba95b63dccce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 15:36:17 +00:00
Ankita Vyas
8053e9da26 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I0a677cc8eb7e6054e3f0780fcdb06db57309738a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 15:36:11 +00:00
Treehugger Robot
70c89004ee Merge "Add a new feature provider for Battery info page" into udc-qpr-dev 2023-05-19 15:35:37 +00:00
Nicolas Sleiman
03e8dbca58 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev 2023-05-19 15:08:35 +00:00
Ankita Vyas
96cff64862 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev 2023-05-19 15:06:39 +00:00
Yi-Ling Chuang
da0702a136 Add Battery Information page 
Add this page to show battery hardware information, including
manufacture date, first use date and cycle counts.

Bug: 276399056
Test: robotests
Change-Id: Iabad3625c88b703abdab4b30998f385de9749478
 2023-05-19 21:45:44 +08:00
Yi-Ling Chuang
7a32e871dc Add a new feature provider for Battery info page 
This feature provider contains the APIs to query certain battery info.

Bug: 276399056
Test: robotests
Change-Id: I8f8503f42a6ad1460b4601e44e8b720b91dd13d1
 2023-05-19 21:21:46 +08:00
Aleksandar Kiridžić
7ea0380779 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: 13317c14f1 am: 2fbca84c5c am: 26a9e0e157 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I8a1dfa8b8c2e2b9745be775af296a0ace2223596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 13:11:28 +00:00
Aleksandar Kiridžić
14c9cfde21 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: ae7734030b am: 0cfa8a3621 am: 7502ec6043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I599acc435794c809cbda662d753c4e561e593eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 13:10:46 +00:00
Aleksandar Kiridžić
110584e058 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: 13317c14f1 am: 741aab96b8 am: c7ccd614bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: Ib5af9f1a7e59ed813b1b9ab675a84dcd158dcf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 13:08:55 +00:00
nsl
f3241ee339 Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings 
Remove the GET_ACTIVITIES flag in InteractAcrossProfiles in Settings to
follow ag/23343098

Bug: 283407612
Test: InteractAcrossProfilesSettingsTest
Change-Id: I299a4a40af3e59f729027b964e938d7783eb7d92
 2023-05-19 12:31:27 +00:00
Aleksandar Kiridžić
26a9e0e157 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: 13317c14f1 am: 2fbca84c5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I5865cdb26823458ab02604bc0be0bd8d39ccde50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 12:27:30 +00:00
Aleksandar Kiridžić
7502ec6043 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: ae7734030b am: 0cfa8a3621 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I76d3e251484e1dda8911e701ce9276365ef32c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 12:20:34 +00:00
Aleksandar Kiridžić
c7ccd614bc Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: 13317c14f1 am: 741aab96b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: Id5f2f8e114034e8b5f87774b08cd893261ce9361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 12:19:55 +00:00