Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into...

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/admin/DevicePolicyManager.java
Simple merge

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

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge