Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534

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



Change-Id: If80b91ea42a838c12f2b21fcf29093b741831566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>