Merge "[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure" into sc-v2-dev am: ac5c8d29f2

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

Change-Id: I1268b36f1114412b6337c5005024ab2031288635