Merge "API refactor: context.startForegroundService()"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/app/IActivityManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge

diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
Simple merge