Merge "Implement ConnectedState" am: 9a59faa385 am: 7d8f1cd5ae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fee1221533d76cd73e0c136b3658059892502f0