No changes in logic, just moving the code around. Bug: 152116619 Test: WM CTS and unit tests Change-Id: I4aa142e07e39950d077c685bb157b4abb2172886
No changes in logic, just moving the code around. Bug: 152116619 Test: WM CTS and unit tests Change-Id: I4aa142e07e39950d077c685bb157b4abb2172886