[automerger skipped] Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev am: 7b3a37fa2f -s ours
am skip reason: Merged-In I7eb25a5db30a82cf8015e3c19af419c02a1d5002 with SHA-1 0684df3b6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16961547
Change-Id: Ieb5bb175ceb186f60de44056a05cf150a2edbbad
This commit is contained in: