Merge "Implement ConnectingState" am: 026b277911 am: 51bdc6991a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0413f3171875d53478bd65cb70d8905721fc4c13