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

Change-Id: I088cc7145a36ac71da2af0d791eef3e0b1f91653