This reverts commit 2741e1dcdb.
Test: Tested on RCPro, CM4/KM4 proto devices
Change-Id: I5dda1c21d215dcfff757b73275f9fc3eac31a19a
Bug: 304936256
Change-Id: I72e6dd09d9443fec8a49fc0c7f7310455946f086
This reverts commit 2741e1dcdb.
Test: Tested on RCPro, CM4/KM4 proto devices
Change-Id: I5dda1c21d215dcfff757b73275f9fc3eac31a19a
Bug: 304936256
Change-Id: I72e6dd09d9443fec8a49fc0c7f7310455946f086