Merge "Abstract out common code for managing a single instance remote...

Merge "Abstract out common code for managing a single instance remote callback" into sc-v2-dev am: 3e90f3b5 am: fcac5264

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

Change-Id: I4fec482d8a75ffc2be1429ce60280aeb261008a8