Merge "Merge "Prevent double teardown of service connections" into qt-dev am: ae76af46b2 am: 991bcc3d78" into qt-r1-dev-plus-aosp
am: 33be633d1f

Change-Id: I4ba6be3ca92e8b1ef0cbb525b4fba4e1051de68d