[automerger skipped] Merge "Do not use hidden API Message.setWhat." am:...
[automerger skipped] Merge "Do not use hidden API Message.setWhat." am: 7f43a4de am: ad95e5f3 am: aa637152 -s ours
am skip reason: Change-Id Ie66f3557f295c4f193c78c5017fd53fe64ad18d8 with SHA-1 c5f4e9dd is in history
Change-Id: I55a5f825da8549b29f7fe872393611be8f9b3052