[automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694
Change-Id: If8bee6f09d8f6c13f40c2457707a2f13086cf005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: