Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev am: fb7c9dfb81 am: 87921ea2d1

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

Change-Id: I6b74a1ff041cb3e06173bb86927997238d19a06e