[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 -s ours am: 1565aca2 am: 8d6651ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68b250ece36f337b9301d231e3f913a0d8da2a5e