This reverts commit ad4d8668. Reason for revert: broke Settings Bug: 74950017 Test: revert only Change-Id: I7a535717d30ec79cd5a2f0529cb7ce511145e0ae