Commit graph

3213 commits

Author SHA1 Message Date
Hana Kim
a29b3c8ca1 Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280 am: 6c17e1e6f5 am: 19e9846ba8 am: 6b1cbfe260
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444

Change-Id: I50d573cc65874987be884d83b72f4aaaa71c8818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 12:18:56 +00:00
Hana Kim
6b1cbfe260 Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280 am: 6c17e1e6f5 am: 19e9846ba8
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444

Change-Id: I9074a2aaab6ef1916fc3fa9a0c1f3e5e3fe610a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 11:49:01 +00:00
Hana Kim
19e9846ba8 Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280 am: 6c17e1e6f5
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444

Change-Id: I0ea2a78c506c360ac10958b08304c6b62167946b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:54:11 +00:00
Hana Kim
6c17e1e6f5 Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444

Change-Id: I929947f0b0ee7c969530343fd779fb88a411a7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:26:19 +00:00
Estefany Torres
899574b2d8 Merge "Add rules for letting logger app send the command to ril" into tm-qpr-dev am: 0ec93ed8cd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19912324

Change-Id: I14947b4a9dc41ffdb9afef580597ee0d4798443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 14:35:07 +00:00
Estefany Torres
0ec93ed8cd Merge "Add rules for letting logger app send the command to ril" into tm-qpr-dev 2022-09-15 14:09:07 +00:00
TreeHugger Robot
a106f636f8 Merge "aoc: add audio property for pixellogger update control" into tm-qpr-dev am: 75f908a8ed
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19533964

Change-Id: I347bbb35b216896a87b3b2edc96af57d6dadfe80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 02:23:57 +00:00
TreeHugger Robot
75f908a8ed Merge "aoc: add audio property for pixellogger update control" into tm-qpr-dev 2022-09-14 01:48:40 +00:00
Hana Kim
09e0e1b280 Sepolicy: add permission to allow create, connect udp socket
Bug: 226412527
Test: Build
Signed-off-by: Hana Kim <hanaa.kim@samsung.com>
Change-Id: Id9ba79ba87010326c53b6aec408e5cdb291122a6
2022-09-12 15:17:44 +08:00
Estefany Torres
7b5ed95fdd Add rules for letting logger app send the command to ril
08-31 23:40:57.354   458   458 E SELinux : avc:  denied  { find } for interface=vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal sid=u:r:logger_app:s0:c252,c256,c512,c768 pid=2901 scontext=u:r:logger_app:s0:c252,c256,c512,c768 tcontext=u:object_r:hal_exynos_rild_hwservice:s0 tclass=hwservice_manager permissive=0
09-01 00:08:19.600  2881  2881 W oid.pixellogger: type=1400 audit(0.0:10): avc: denied { call } for scontext=u:r:logger_app:s0:c252,c256,c512,c768 tcontext=u:r:rild:s0 tclass=binder permissive=0 app=com.android.pixellogger

Bug: 241412942
Test: tested in C10 with pixel logger change
Change-Id: Idcd693790d654d0a9b7aba46a41764d65867a61c
2022-09-09 17:35:19 +00:00
JJ Lee
479f2286d7 sepolicy: add nodes for aoc memory votes stats am: f07279785d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19739216

Change-Id: I795b972da3d42e7394fbd954f041934370fbd77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 05:16:23 +00:00
JJ Lee
f07279785d sepolicy: add nodes for aoc memory votes stats
Bug: 223674292
Test: build pass, not blocking bugreport
Change-Id: I4732c8b3271f553edc423ac115eb8a6afaebff37
Signed-off-by: JJ Lee <leejj@google.com>
2022-09-07 11:45:18 +00:00
Roger Fang
5321008d5c sepolicy: add permission for AMS rate of pixelstats-vend am: a8eab1aaaf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19711052

Change-Id: I61f3cfbb14f0f34bf0af2eaba1922b9aed4b7948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 05:15:55 +00:00
Roger Fang
a8eab1aaaf sepolicy: add permission for AMS rate of pixelstats-vend
I pixelstats-vend: type=1400 audit(0.0:1025): avc: denied { read } for name="ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1
I pixelstats-vend: type=1400 audit(0.0:1026): avc: denied { open } for path="/sys/devices/platform/audiometrics/ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1
pixelstats-vend: type=1400 audit(0.0:1027): avc: denied { getattr } for path="/sys/devices/platform/audiometrics/ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1

Bug: 239508478
Test: Manually test passed

Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: I5c47003bed664f2cd9b6fe3630a6445aca27d10d
2022-08-30 04:36:41 +00:00
Robb Glasser
6ce1ff96e4 Give permissions to save usf stats and dump them in bugreports. am: 4b4afb2eea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19672464

Change-Id: Iacf95664f2ba6bf126b82e2e2d73bddcddb70422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:38:27 +00:00
Robb Glasser
4b4afb2eea Give permissions to save usf stats and dump them in bugreports.
Creating a mechanism to save some USF stat history to device and pipe it
to bugreports. Granting permissions so that this can work.

Bug: 242320914
Test: Stats save and are visible in a bugreport.
Change-Id: Ia1973800ed053f54da043d306e11c0a7b10132a7
2022-08-24 22:39:16 +00:00
Treehugger Robot
8a978f91ea [automerger skipped] Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca am: a4d246abac am: 6481874c77 am: 4c9a910a60 -s ours
am skip reason: Merged-In I8600283d9ff2ebcb45df95e5259484a60921fb1a with SHA-1 c96220c282 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507

Change-Id: Ieeb614105a88c6dd27a46a49b2a2bff8d2252892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 08:13:18 +00:00
Treehugger Robot
4c9a910a60 Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca am: a4d246abac am: 6481874c77
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507

Change-Id: Ica06811653100886c99ea2d01ab09edfdd83585f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:46:49 +00:00
Treehugger Robot
6481874c77 Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca am: a4d246abac
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507

Change-Id: Ib9ba46ae5b7e0454927f18e48a85f03f6847ef83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:29:18 +00:00
Treehugger Robot
a4d246abac Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507

Change-Id: I89572f1c793f464011163d50c0ef19c95f3b13d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 06:59:40 +00:00
Treehugger Robot
d6ff29d1ca Merge "Add security context for com.google.usf.non_wake_up/wakeup." 2022-08-22 06:38:52 +00:00
Treehugger Robot
e3fc764940 [automerger skipped] Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9 am: c56dc643a4 am: b2e001581b am: b551e0475f -s ours
am skip reason: Merged-In If9add3528bde47a618bd884ce28121b6fa32754c with SHA-1 bf1333f881 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506

Change-Id: I272afe3233e8fd5303271257613c45cc9d284e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 05:29:17 +00:00
Treehugger Robot
b551e0475f Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9 am: c56dc643a4 am: b2e001581b
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506

Change-Id: I46122f6a44cb7bc4ea9fb1f63c4e57e8f92709f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 05:12:24 +00:00
Treehugger Robot
b2e001581b Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9 am: c56dc643a4
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506

Change-Id: Ibd378b384da9da3b9a08c9d56e72ecc5b3fd8ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 04:44:16 +00:00
Treehugger Robot
c56dc643a4 Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506

Change-Id: Id1cdbd151bd58bfca12ea328f749a54b54d4edb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 04:24:22 +00:00
Treehugger Robot
3cb1ea79c9 Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." 2022-08-22 04:10:13 +00:00
Xin Li
b457568612 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ac180b779b -s ours am: e6e50e6051 -s ours am: d6913cae13 -s ours
am skip reason: Merged-In I03be37c9e50280d6fa2cfdd69dca83c0535b2e35 with SHA-1 b577060b2d is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2186421

Change-Id: Iadb6bab6a18b57d8b42d69ffbe51b4d6eb6dc4c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:36:26 +00:00
Xin Li
d6913cae13 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ac180b779b -s ours am: e6e50e6051 -s ours
am skip reason: Merged-In I03be37c9e50280d6fa2cfdd69dca83c0535b2e35 with SHA-1 b577060b2d is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2186421

Change-Id: Ia1fa38ac57b276d16bf5ea84454b4110a4d06366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:06:05 +00:00
Xin Li
e6e50e6051 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ac180b779b -s ours
am skip reason: Merged-In I03be37c9e50280d6fa2cfdd69dca83c0535b2e35 with SHA-1 b577060b2d is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2186421

Change-Id: Iac9b3c92887d80300bafde61f1dcd79d248feab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 22:43:59 +00:00
Xin Li
ac180b779b DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I03be37c9e50280d6fa2cfdd69dca83c0535b2e35
Change-Id: I8feb38896fbd83a590fefebc4f356582315630e7
2022-08-15 22:00:01 -07:00
matthuang
62ba653669 Add security context for com.google.usf.non_wake_up/wakeup.
Bug: 195077076
Test: Confirm there is no avc denied log.
Change-Id: I8600283d9ff2ebcb45df95e5259484a60921fb1a
Merged-In: I8600283d9ff2ebcb45df95e5259484a60921fb1a
2022-08-15 18:52:58 +08:00
matthuang
7e89415aaf Add acd-com.google.usf.non_wake_up file to AoC file context.
Bug: 195077076
Test: ls -lZ dev/acd-com.google.usf.non_wake_up
Change-Id: If9add3528bde47a618bd884ce28121b6fa32754c
Merged-In: If9add3528bde47a618bd884ce28121b6fa32754c
2022-08-15 18:46:52 +08:00
yixuanjiang
0bbfb98cac aoc: add audio property for pixellogger update control
Bug: 241059471
Test: local verify
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: I13df2ea88b884756d3a872da545e877ed6b1e033
2022-08-08 03:48:21 +00:00
Bruce Po
62c16fd040 Allow aocd to access acd-offload nodes am: 1673f21545
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19472656

Change-Id: I524c210830ba139cb36ee5c8a664d87cc5c497ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 19:05:57 +00:00
Bruce Po
1673f21545 Allow aocd to access acd-offload nodes
For 3-ch hotword feature, aocd daemon will access two new file nodes
(b/235648212), which will be used for transmitting audio to/from AOC.

BUG: 240744178
Change-Id: Ie0a9403d0dca06befdb807067adb9babc4f28bfc
2022-08-02 06:29:42 +00:00
Steven Moreland
3a8d58a1d6 [automerger skipped] Restore HAL type names. am: b577060b2d -s ours am: 0b3734e918 -s ours am: d524c356c4 -s ours am: 85aac05e32 -s ours
am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2171622

Change-Id: I90b895cc43e696e27e803fb4ae49288d2c25bda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 20:24:01 +00:00
Steven Moreland
85aac05e32 [automerger skipped] Restore HAL type names. am: b577060b2d -s ours am: 0b3734e918 -s ours am: d524c356c4 -s ours
am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2171622

Change-Id: I372f5eadd13eaaffe9afda8b9828fa65276600e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 20:06:24 +00:00
Steven Moreland
d524c356c4 [automerger skipped] Restore HAL type names. am: b577060b2d -s ours am: 0b3734e918 -s ours
am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2171622

Change-Id: I72c5783bcaad73c6cfff12688f0f1a9c4658008a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 19:49:44 +00:00
Steven Moreland
0b3734e918 [automerger skipped] Restore HAL type names. am: b577060b2d -s ours
am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2171622

Change-Id: Ib3e5940f7132201773088487d892a0c23fd22f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 19:28:53 +00:00
Steven Moreland
b577060b2d Restore HAL type names.
Sed'd. TH not configured on AOSP. This is the change that is applied already internally.

Change-Id: I03be37c9e50280d6fa2cfdd69dca83c0535b2e35
2022-08-01 18:41:26 +00:00
Steven Moreland
0f5940d969 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours am: 235c5c3ba6 -s ours am: 0add999ea6 -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ia894717849e4a76a579867c4f7d9c5b9a7e24b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:41:14 +00:00
Steven Moreland
a49ba9a5b0 [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours am: 1cd11b0bae -s ours am: 0cb7db439d -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I2ac9d93c20ba70ce47ef90dbc2372ad71980a889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:41:13 +00:00
Steven Moreland
0add999ea6 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours am: 235c5c3ba6 -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ia302639c8e32d70191922d2b2be3524998b1cea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:17:40 +00:00
Steven Moreland
0cb7db439d [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours am: 1cd11b0bae -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I574a62e51fefd43bb174b5a1e6ad097dab6570ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:17:39 +00:00
Steven Moreland
235c5c3ba6 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I2ab3c0e8d7fdb7e26e7b0b0ab79caf9ce39a93d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:52:32 +00:00
Steven Moreland
1cd11b0bae [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I1151cb806654e2e37f1ea1f862dfff41810c1759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:52:30 +00:00
Steven Moreland
f200aa0cee [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ieb341a369cd4d986dbfc47b0106202cd4a6e7e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:26:20 +00:00
Steven Moreland
8354f470a4 [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I43b7480f97cc201f0b092ffa73ed0d92cab75296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:26:18 +00:00
Steven Moreland
c6545d33ff Merge "Remove vendor_service." 2022-08-01 17:07:40 +00:00
Steven Moreland
58182caeeb [automerger skipped] Remove vendor_service. am: b20e917ebf -s ours am: 4783ac2aff -s ours am: 83ca4acec8 -s ours
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 81ccf8d719 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19469145

Change-Id: Icb77dd094be072bf8d07f03802c1d46a27d0cfe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:54:12 +00:00