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

Change-Id: I765f4286e09535ecc577f6629cd218169639036e