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