Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am: dab9eff899" into oc-mr1-dev-plus-aosp