Wei Wang
5be2bec4e6
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
am: 583a242d9b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: Ib2a2c3a9ddd1f4f8e8570e31629f98cf76b08113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:52:11 +00:00
Wei Wang
aaa50748bc
allow udfps hal to access trusty am: 615f85c22d
am: daf2093583
am: f041f70a21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I734b1cb28342c0cb0ae99deeaa8f000e3f532081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:51:32 +00:00
Wei Wang
ec6ae16e0b
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
am: b9f0680283
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: Ia36da932a460a31168194288a7d4a15b2164d7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:51:09 +00:00
Wei Wang
583a242d9b
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I8c55549d01528b33cbf4333930c4c4c0a8281e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:10:03 +00:00
Wei Wang
f041f70a21
allow udfps hal to access trusty am: 615f85c22d
am: daf2093583
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I90d58607416a0874ca4a80ecb46d902f8764e8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:50 +00:00
Wei Wang
b9f0680283
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I45576b46edad47a0614534f0a503a99036936e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:40 +00:00
Wei Wang
55b71bf208
allow udfps hal to access trusty am: 615f85c22d
am: a68059705b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: If423807ae19d1396e2a15f4b3deec3faf6125e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:10 +00:00
Wei Wang
b94efeaff0
allow udfps hal to access trusty am: 615f85c22d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I021692200c0bc229f23d573685f1ca75c4fb0ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:15:56 +00:00
Wei Wang
a68059705b
allow udfps hal to access trusty am: 615f85c22d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I1859ad36b4a2e48d87533f22e777112fe6ac031b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:14:47 +00:00
Wei Wang
daf2093583
allow udfps hal to access trusty am: 615f85c22d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I4d62137c19cbccd9ce294f2c34c40199b60e3b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:14:20 +00:00
Wei Wang
615f85c22d
allow udfps hal to access trusty
...
Bug: 229350721
Bug: 230492593
Test: UDFPS with stress
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ib1abe0e0318689528a6658f3597f1c11ad9fa1c3
2022-04-27 20:20:43 +00:00
Treehugger Robot
fd65b31055
Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2044871
Change-Id: Ib0ea1d39f90456062a1d18ac86ff8c6140cb29eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Treehugger Robot
c49520d66e
Merge "android.hardware.usb.IUsb AIDL migration"
2022-04-27 16:21:29 +00:00
Jenny Ho
15036785cf
sepolicy: allow access debugfs charger register dump
...
[ 438.549652] type=1400 audit(1651035282.616:8): avc: denied { read } for comm="dumpstate@1.1-s" name="registers" dev="debugfs" ino=31549 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:debugfs:s0 tclass=file permissive=0
[ 438.550252] type=1400 audit(1651035282.616:9): avc: denied { read } for comm="dumpstate@1.1-s" name="registers" dev="debugfs" ino=31532 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:debugfs:s0 tclass=file permissive=0
Bug: 230360103
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I102a159ca23a65d99a52cac3d011f5ce535a37e7
2022-04-27 10:09:48 +00:00
Anthony Stange
8c311f981b
Update SELinux to allow CHRE to talk to the Wifi HAL
...
Bug: 206614765
Test: Run locally
Change-Id: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
Merged-In: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
2022-04-27 06:13:14 +00:00
Edmond Chung
89b31263c0
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours am: bdd7f4ca53
-s ours am: d99f3881c6
-s ours am: 1859147fa3
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: I7958cb859b2dcd075605fdfb5774bcbbff0b86da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 22:01:19 +00:00
Edmond Chung
1859147fa3
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours am: bdd7f4ca53
-s ours am: d99f3881c6
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Iaa8dbe6c54273c3dab6c52cff2bccf75a1a70ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:38:31 +00:00
Edmond Chung
d99f3881c6
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours am: bdd7f4ca53
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Ic110cb2ce1580b19d6acb94a6f7d2e3d02595c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:15:49 +00:00
Edmond Chung
bdd7f4ca53
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Ic494c66247402a0839fa839049196aff29f5d97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:54:38 +00:00
Edmond Chung
a287bef991
Camera: add setsched capability. am: 99b4aebb6a
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: I2b276fc1165bcd66d9075566d50f0971e1447811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:19:27 +00:00
Automerger Merge Worker
d673632679
Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
" into tm-d1-dev-plus-aosp am: 3cb7dddc64
am: 44de2b767b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: Ie2837f6688b9d82a0e10e7018ae6c737a1f450ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:41:39 +00:00
Wei Wang
84b91f8765
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 05f0628196
am: 9856bda336
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: Id90168c2657cbc5d095a7a916d37bb8219acb22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:41:22 +00:00
Wei Wang
18b9a739f1
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 0335b3f6bc
am: a26e583d7c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I990700ac5ee11a03a41db14b3cee1f839d2cd1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:40:11 +00:00
Automerger Merge Worker
44de2b767b
Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
" into tm-d1-dev-plus-aosp am: 3cb7dddc64
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I03d12de6bfdeb533692ba46089bbdaa1a5ddbb52
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:09:27 +00:00
Wei Wang
9856bda336
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 05f0628196
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I6c02397e8f46d0c495f7d5bd47e477743bde96c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:00:03 +00:00
Wei Wang
a26e583d7c
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 0335b3f6bc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I2e638f622cc0abfbd3b894419bcafcf4260791d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:59:40 +00:00
Automerger Merge Worker
3cb7dddc64
Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
" into tm-d1-dev-plus-aosp
2022-04-26 17:38:53 +00:00
Wei Wang
e652a35fa3
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I616b4ca914130186440e4639c441496311fec4ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:45 +00:00
Wei Wang
05f0628196
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I52b64f50174a352afb0de2215a10208a13c0f5f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:44 +00:00
Wei Wang
0335b3f6bc
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I414ecceb80c9d85270e4657bf83c6ed9e23b50b7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:41 +00:00
Wei Wang
df8538417f
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: c0ed4a78b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: Ic8eacd4048c18099ace7dc93cd9a92ea167a181d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:14 +00:00
Wei Wang
dff2ecee1c
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I93b6b6da30c68efc6df038a4ba9d30e037abd8bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:57 +00:00
Wei Wang
bf80f3cc08
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I79cfb5eb2b9ceca77ce133466e6820a8c81477d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:24 +00:00
Wei Wang
c0ed4a78b8
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: Ic574e1c04ce02a80576bfaccad973636f33c0c6b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:16 +00:00
Wei Wang
5e9a38799a
Merge "Grant trusty to power hal" into tm-dev
2022-04-26 16:47:14 +00:00
chiayupei
a53690ac43
hal_sensors_default: Allow sensors HAL to access AoC properties.
...
Bug: 202901227
Test: Verify pass by checking device log.
Signed-off-by: chiayupei <chiayupei@google.com>
Change-Id: I917362ddf4b8e61810d2dd27da2b7775f1aec1e7
2022-04-26 17:50:44 +08:00
Edmond Chung
99b4aebb6a
Camera: add setsched capability.
...
The camera HAL needs to configure schedule policies for
performance optimizations.
Bug: 228632527
Test: adb logcat
Change-Id: Ifbf433c026549ca774a9521704d0b0b75c9e9f23
Merged-In: Ifbf433c026549ca774a9521704d0b0b75c9e9f23
Signed-off-by: Edmond Chung <edmondchung@google.com>
2022-04-25 15:25:01 -07:00
Edmond Chung
7df606ada7
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: bc43318ab4
am: ec3eb186b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Ifc5b0f001522fb16ceafdf115bb7e58838bd36f3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:08:37 +00:00
Edmond Chung
6f7d8efc81
Camera: add setsched capability. am: 2715a08a73
am: c68109ee72
am: 0a19bd4993
am: ac6129be5c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I06ba9f7821ceacde035c5eacd0f4e35f1da48721
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:07:32 +00:00
Edmond Chung
ddb3458fcd
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: ac4e2bd183
am: 42ff0da1b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I065078241fd03e617bb220a1c4212de3fd8227bb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:04:57 +00:00
Edmond Chung
ec3eb186b8
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: bc43318ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I0bad94015b6ea1f59f1e64873b2dc346d8607dcc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:32:05 +00:00
Edmond Chung
ac6129be5c
Camera: add setsched capability. am: 2715a08a73
am: c68109ee72
am: 0a19bd4993
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I30039f0947da0e4893addf323b31a8a92616fd7b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:31:14 +00:00
Edmond Chung
42ff0da1b5
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: ac4e2bd183
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Iffc8f37963b9a979574b4fb2a178ca507262019f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:30:54 +00:00
Edmond Chung
bc43318ab4
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Ic43c0ee5f6461b2324b7fbfba4ea3d77f1463387
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:21 +00:00
Edmond Chung
0a19bd4993
Camera: add setsched capability. am: 2715a08a73
am: c68109ee72
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I4778f484ac54693df54e55fcada9405a393811b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:08 +00:00
Edmond Chung
ac4e2bd183
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I10e45832daefc30d2607c5017e581db4db364c9f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:04 +00:00
Edmond Chung
835c8cce14
Camera: add setsched capability. am: 2715a08a73
am: 2f238e9f71
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I456b149baf00969cdc9c3f87c97221e37a22ae3e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:01:35 +00:00
Edmond Chung
0ddf256588
Camera: add setsched capability. am: 2715a08a73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I226c2636c54592127c8786e1e7a8e58e182159db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:30:22 +00:00
Edmond Chung
2f238e9f71
Camera: add setsched capability. am: 2715a08a73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Ia3a4c1e389e425634212e7579fade187243efcbe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:29:17 +00:00
Edmond Chung
c68109ee72
Camera: add setsched capability. am: 2715a08a73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I031f55c945c6ec65016255256b70a77f99844b54
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:28:59 +00:00