Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae am: 01d13bb7ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810 Change-Id: I7119276b60d9859c9915b4051c1f7714a5bf13d6
This commit is contained in: