Commit graph

3126 commits

Author SHA1 Message Date
Kris Chen
2dfd438649 Remove the temporary FCM setting for fingerprint am: 8efde59fb6 am: acd686d881
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: Ifa30fd78f951b9e297b367b9b849eb2024245695
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:41 +00:00
Kris Chen
5a56fe719b Remove the temporary FCM setting for fingerprint am: 8efde59fb6 am: acd686d881
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: I16848898e800b47f518fd783c0c992a3dd9a6c2c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:38 +00:00
Kris Chen
0ae0ac25f4 Remove the temporary FCM setting for fingerprint am: 8efde59fb6 am: 3606098bd0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: I54e1e39655800c84c7405f3707d472228a4955db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:27:22 +00:00
Kris Chen
82430bf13e Remove the temporary FCM setting for fingerprint am: 8efde59fb6 am: 455d7996ea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: Id1bf182e5d78528a083a3f956022bdf551b8b8ac
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:26:57 +00:00
Kris Chen
acd686d881 Remove the temporary FCM setting for fingerprint am: 8efde59fb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: I6438364945da918d17c66b053db638cce8b8d56f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:53:52 +00:00
Kris Chen
455d7996ea Remove the temporary FCM setting for fingerprint am: 8efde59fb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: I126f16f9d902e6a961abfc047c97c1c93f881a02
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:52:52 +00:00
Kris Chen
3606098bd0 Remove the temporary FCM setting for fingerprint am: 8efde59fb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903536

Change-Id: Id5ae7af23818addefeb052c9396ab0bd45194eae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:52:31 +00:00
Kris Chen
8efde59fb6 Remove the temporary FCM setting for fingerprint
Bug: 223118104
Test: m check-vintf-all
Test: atest vts_treble_vintf_vendor_test
Change-Id: I08de753408d4ae1ec503ad8037d3dfd22d400e80
2022-04-25 06:28:09 +00:00
Automerger Merge Worker
0b229767db Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: 2e9ed2e2fc" into tm-d1-dev-plus-aosp am: 29dde30afd am: 05433d666e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I2e539b8a724607aefd83109c5b8250cb25122782
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:27:31 +00:00
Kelly Rossmoyer
027173368e Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194 am: 88b513c3ce am: 2ec8a22556
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: Ifdcecc651e857506a7e2ad369b06c81be04dc84c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:27:09 +00:00
Kelly Rossmoyer
0434882fe2 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194 am: a786fe58f5 am: 0d5cabdc4d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I4f77301f4645f9c3c01d04bccf00c3f442f7b146
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:26:48 +00:00
Automerger Merge Worker
05433d666e Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: 2e9ed2e2fc" into tm-d1-dev-plus-aosp am: 29dde30afd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: If59c8da7d7830ce5c6e88c41a8a90010ad2d6d87
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:57 +00:00
Kelly Rossmoyer
2ec8a22556 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194 am: 88b513c3ce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I6c5b4c8431fae2f74f47cfe88b441158d5c595df
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:32 +00:00
Kelly Rossmoyer
0d5cabdc4d Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194 am: a786fe58f5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I46b7f6bf63f3b91e051413f105b85e9da074b988
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:13 +00:00
Automerger Merge Worker
29dde30afd Merge "Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: 2e9ed2e2fc" into tm-d1-dev-plus-aosp 2022-04-25 04:42:03 +00:00
Kelly Rossmoyer
88b513c3ce Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I86274715d9833a603bca8daf7863c0700b9eb666
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
d57d626ed4 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: 2e9ed2e2fc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: If4dcad66da023c47ab3c6f731ff4ec8dd8842eef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
a786fe58f5 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: c5c3bcc194
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: Ic076f020425cbe899e69aeadc241c67d93c33f32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:53 +00:00
Kelly Rossmoyer
87828e886c Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8 am: 3c10ced256
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: Ic2ffa5339a5395c25a40bd5f6e08ad18c63c05bb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:25 +00:00
Kelly Rossmoyer
c5c3bcc194 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I0391ca469cfcbf250e449ac51ca1f9bcbcf82df2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:16 +00:00
Kelly Rossmoyer
3c10ced256 Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: Ie17692db5a2046693066c9d6d1de99cbb93c5137
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:17:11 +00:00
Kelly Rossmoyer
2e9ed2e2fc Revert "powerstats: set time limit as timeout for AoC" am: f2fa5042d8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17935513

Change-Id: I120d7274368d7d4c517999b6375f9f8cad02552a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:16:51 +00:00
Kelly Rossmoyer
f2fa5042d8 Revert "powerstats: set time limit as timeout for AoC"
Revert "powerstats: timeout mechanism for AoC data provider"

Revert submission 17800080-power-stats-aoc-timeout

Reason for revert: Causing crashes due to improper thread sync
Reverted Changes:
I71a9e6817:powerstats: timeout mechanism for AoC data provide...
I725c00745:powerstats: set time limit as timeout for AoC
I5b290a53d:powerstats: set time limit as timeout for AoC

Change-Id: I84f5173aada0539d8c91d18d36a841bc9f3e3c9a
2022-04-25 03:56:51 +00:00
Kyle Tso
5117fa4518 usb: Modify the controller name am: ef25209b6b am: 1c35126bb5 am: ff01edec30 am: ac479cdec2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: If3f32d8bcb64d4ce4caeafa1b2200ff7e3c09871
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:22:25 +00:00
Kyle Tso
c8c57227c2 usb: Modify the controller name am: ef25209b6b am: 1c35126bb5 am: 296cd4eb8e am: 6948b3ca99
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ibf2174896d27b0be8f9b907aef3e111ee1fc5598
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:22:12 +00:00
Kyle Tso
edfa3987ab usb: Modify the controller name am: ef25209b6b am: e59b3f652f am: 9e4b0c30b5 am: addd9ea95f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: I873e3f977129665abb165cc4c87abb7909089fde
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:21:56 +00:00
Kyle Tso
ac479cdec2 usb: Modify the controller name am: ef25209b6b am: 1c35126bb5 am: ff01edec30
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ib4b6c90828d765e63eab5cdf87fa18e688f58756
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:20:53 +00:00
Kyle Tso
6948b3ca99 usb: Modify the controller name am: ef25209b6b am: 1c35126bb5 am: 296cd4eb8e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: If16ddbb1ad3143f923c5c9f18785eb5a21492e4f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:56:51 +00:00
Kyle Tso
addd9ea95f usb: Modify the controller name am: ef25209b6b am: e59b3f652f am: 9e4b0c30b5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ib5c26d4c0e6d6743d9b8a2c9df1ba9edc3c33bd6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:56:44 +00:00
Kyle Tso
296cd4eb8e usb: Modify the controller name am: ef25209b6b am: 1c35126bb5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Id40d2aa44d075fd68c668dd97d3ffc5f8b261e11
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:49:14 +00:00
Kyle Tso
ff01edec30 usb: Modify the controller name am: ef25209b6b am: 1c35126bb5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ib0486087694714deaf6181ed1a325f9c9e52a5c1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:49:12 +00:00
Kyle Tso
9e4b0c30b5 usb: Modify the controller name am: ef25209b6b am: e59b3f652f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: I54147cc03a5f8e49444897bae1c40a7900b225cb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:33:23 +00:00
Kyle Tso
e2511b10b4 usb: Modify the controller name am: ef25209b6b am: e3ec23d85a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ida61ffd7a209a9c44d8533655ec07a626b9c1700
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:32:55 +00:00
Kyle Tso
1c35126bb5 usb: Modify the controller name am: ef25209b6b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: I303aa390cba705108c59f98bc00dd8814b956ac7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:13:22 +00:00
Kyle Tso
e3ec23d85a usb: Modify the controller name am: ef25209b6b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: Ibd00cfe4bc9e35e5633afd536a75a787dd635e80
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:12:18 +00:00
Kyle Tso
e59b3f652f usb: Modify the controller name am: ef25209b6b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17903535

Change-Id: I253111e218b55aee7097a0db5daba3bf85588fbe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 02:12:00 +00:00
Kyle Tso
ef25209b6b usb: Modify the controller name
The name is 11210000.dwc3.

Bug: 229960483
Signed-off-by: Kyle Tso <kyletso@google.com>
Change-Id: I671efc2e07b7057220b190181b0ef1bcef1e0dd4
2022-04-25 01:37:42 +00:00
Android Build Coastguard Worker
235fb60a90 Snap for 8492734 from f604ca2948 to tm-qpr1-release
Change-Id: Idbca320436947d20c0c44cb1a8699484ae9cbe38
2022-04-23 05:07:04 +00:00
Sal Savage
4ed5805f6b Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0 am: 1756327177 am: 312b91ab27
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: Iba7121d366c3aa50d4feadd7745c67eb60f7396e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:31:44 +00:00
Automerger Merge Worker
1cf7f8e47b Merge "Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: f77a4c7dae am: 1e4ce45bde" into tm-qpr-dev-plus-aosp am: 3f1823bec6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: Iacec1b26d629dc6b46bbc17c2580bcadac8d47bc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:28:20 +00:00
Sal Savage
d17001dce6 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0 am: f604ca2948 am: aa8ec158ef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I4ddb3d2177b4e2086670c1af69e9adff48fde944
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:21:08 +00:00
Sal Savage
312b91ab27 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0 am: 1756327177
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: Icbd7d64ed566e2a6892acbbf3c8e659b72777085
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:30:57 +00:00
Automerger Merge Worker
3f1823bec6 Merge "Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: f77a4c7dae am: 1e4ce45bde" into tm-qpr-dev-plus-aosp 2022-04-22 23:28:23 +00:00
Sal Savage
b67247fb3f Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: f77a4c7dae am: 1e4ce45bde
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I5306cdcad3b938fe1f14f7ea84a35f2483d41652
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:27:56 +00:00
Sal Savage
aa8ec158ef Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0 am: f604ca2948
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I6823742bd0e05e01e0f29c66aeaa8f77338ec96d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:27:20 +00:00
Sal Savage
f604ca2948 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I90fd2df89173f1691f023524b76341872a214c9b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:05:30 +00:00
Sal Savage
1756327177 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 0ac56396a0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: Ied1853cf3b62fdce220d512c7be65207f596b7b7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:05:18 +00:00
Sal Savage
1e4ce45bde Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: f77a4c7dae
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I8d2727cd6dd2213ccae61daa5b8f3101d27e9da2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:56:05 +00:00
Sal Savage
7d334d58e0 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21 am: 92516cd3b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I247d68f2142c3547051d77485e2e96de325729e8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:46:59 +00:00
Sal Savage
0ac56396a0 Update LE Audio profile properties to match spec and implementation am: 2d14aaae21
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17694252

Change-Id: I1bed843528e90fe0153b2c73aec2d117c982c86b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:42:33 +00:00