[automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 am: 61f6e5bc81 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713 Change-Id: I6b80e471e965583530a3843ea6e7a6bfdb8dcdff
This commit is contained in: