Merge "Implement DisconnectingState" am: 2cfb250d6d am: d3b37546db

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddeef57b3711591bd436f041ac0ce08971f93a26