[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear." am: 690f008e3f  -s ours
am: 6f8fef77de  -s ours

Change-Id: Ibd0b306b9776821b84680894c14250e3d9a2913a