[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

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

Change-Id: I20d06c0957ab5309c5ab72189e84cc87e8ecdf0c