Merge "Guard against incorrect ID assignment in CdmService" into tm-dev am: eaceca75 am: dc9dc8f9

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



Change-Id: I1aa3005fdd51db2bbd346258301a5936bdaf40d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>