[automerger skipped] [DO NOT MERGE] Fix layout for errorprone build am: 79709cfb41 am: 29350ae917 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713 Change-Id: I08cb32b2aba26e3375c1b4282a97cc2c7185cb44
This commit is contained in: