Merge "Merge "Fix bug in registering death listener" into rvc-dev am:...
Merge "Merge "Fix bug in registering death listener" into rvc-dev am: bff8230a am: b2cd9f9a" into rvc-d1-dev-plus-aosp am: 736aaf39
Change-Id: I17c04328294faef2c69e5e7ef0247bdaebe84e10