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

Change-Id: I7bd3744367c8538d984858b0a66da728f4c4d5ba