Merge "Improved AutoFill Save workflow."

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/view/View.java
Simple merge

diff --cc core/java/android/view/ViewGroup.java
Simple merge

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