[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
am: 367f6a2098  -s ours

Change-Id: I578294f662be2860da25f0cbc8066c3fb4f49f5a