[automerger skipped] Merge "Fix DvrClient data type" into tm-dev am:...

[automerger skipped] Merge "Fix DvrClient data type" into tm-dev am: 88efebe4 am: f216ea1d -s ours

am skip reason: Merged-In Iaa3aaca3e92498147c72956957701f7bf902f405 with SHA-1 6beccb2b is already in history

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

Change-Id: Ifebbf3cc9b43350ac5050762855dfa582061971f