[automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build"...

[automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd74 am: 7ebc2659 -s ours am: 0375bb79 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5803a2cf7959b865662d96fe57a8a11f81a611fa