This reverts commit e8b7635634.
Reason for revert: Change not supported by vendor
Bug: 149522248
Bug: 143238237
Change-Id: Iaf9eb6493b937545ba5f046912fc023887e7b566
Merged-In: I17315f5b99ad7c5a5a6d88ed21a825301fa8e5e5
This reverts commit e8b7635634.
Reason for revert: Change not supported by vendor
Bug: 149522248
Bug: 143238237
Change-Id: Iaf9eb6493b937545ba5f046912fc023887e7b566
Merged-In: I17315f5b99ad7c5a5a6d88ed21a825301fa8e5e5