Merge "Adding API for apps to specify their aspect ratio when entering PIP."

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 core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

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

diff --cc services/core/java/com/android/server/wm/PinnedStackController.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge