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

Change-Id: Ibe604f8ffe0ef389804cd7491619a9db9fda3d38