Exempt-From-Owner-Approval: cherry-pick from AOSP
Bug: 157724521
Test: m
Merged-In: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
(cherry picked from commit 33c7736936
)
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
Exempt-From-Owner-Approval: cherry-pick from AOSP
Bug: 157724521
Test: m
Merged-In: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
(cherry picked from commit 33c7736936
)
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151