[automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" am: e908a1d318  -s ours
am: f7a03e7b3a  -s ours

Change-Id: If9a4fa6ede676b0426992023da1259753fe3d064