[automerger skipped] Fix lint error for those module used in mainline module am: d56251bae4 am: 0d1290e7c3 am: 084c9427b0 am: a3380bcc63 -s ours
am skip reason: Merged-In I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277 with SHA-1 d56251bae4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187812
Change-Id: Ifcf0e90ed3807d66ef8a17d6e473aa6ac7fa8432
This commit is contained in: