Merge "fix failing tests of DisplayManagerService" into tm-dev am: 8396d7c4 am: ba6a057d am: f2711d4e am: ccc8c6b1

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



Change-Id: I01a518d651a5b1298524ddfd7db0ae70ca8d2e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>