This reverts commit 9516314de4.
Reason for revert: I submitted ag/13740889 too early. Now that ag/13700299 has been submitted, I want to re-submit this change.
Bug: 175429607
Tested: on device
Change-Id: Iac1363ca4745636b8133f38fcc43e77444c6c1e6