Merge "Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 am: 0b6676d7bc" into nyc-mr1-dev-plus-aosp