[automerger skipped] Merge "[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure" into sc-v2-dev am: ac5c8d29 am: 58758b27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie70af4bb7195f8680346375509d69bd3cf38dcfa