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

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



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