Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836 am: 013e3748c3 am: 188fe080df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135 Change-Id: I1b4360eaeb19e2eebca48ea1f04c7bc3bdab2e5e
This commit is contained in: