tree cc0257fcd3b8bde7dc759042ecf1059165a9dd66
parent 97dfb6aeebcd538d43d5717c2a823e019b0d6c9f
author Tadashi G. Takaoka <takaoka@google.com> 1541294500 -0700
committer Tadashi G. Takaoka <takaoka@google.com> 1541297608 -0700

Move some AM tests back to FrameworksServicesTests

The following com.android.server.am tests has been moved to WmTests by
Idc2dc9e80d, but those should be moved back to FrameworksServicesTests.
 - ActivityManagerServiceTest
 - ActivityManagerTest
 - ActivityManagerInternalTest
 - AppErrorDialogTest
 - BroadcastRecordTest
 - CoreSettingsObserverTest
 - GlobalSettingsToPropertiesMapperTest
 - MemoryStatUtilTest
 - UserControllerTest

Bug: 113800711
Test: Pass all AM presubmit tests in FrameworksServicesTests
  $ tradefed.sh run commandAndExit FrameworksServicesTests \
      --include-filter com.android.server.am. \
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest

Change-Id: I8852d1a26d7e9d9e52a06fb8ed90d15b6f40bf1c