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

Change-Id: Ibb2c56554f0df15cf287c90aa1f183674e948f3d