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

Change-Id: Icc4111c3024fb71cee04bd272cbf2123d0563791