Merge "[CDM bug] Fix CDM crash when there's no CDM service" into tm-dev am:...

Merge "[CDM bug] Fix CDM crash when there's no CDM service" into tm-dev am: e2a47a2c am: b31e4b2a

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

Change-Id: Id5a2dc944b9e56ce8a9df90b8194d06df05bbb52