[automerger skipped] Merge "API Review: Clarify deprecated docs and rethrow...

[automerger skipped] Merge "API Review: Clarify deprecated docs and rethrow from system server" am: 0fd00037 am: 1e87aa36 -s ours am: b3acb68d -s ours am: 6e3de254 -s ours am: 0e4a3a24 -s ours

am skip reason: Change-Id I5c2bacad43917a6ecad49dcf9d3213b3472534cc with SHA-1 6d8722cb is in history

Change-Id: Ib4819173cad1411e858f2cdeb9c113fb4fd8aa98