[automerger skipped] Fix lint error for those module used in mainline module...

[automerger skipped] Fix lint error for those module used in mainline module am: d56251ba am: cfe80100 -s ours am: edc96bcb -s ours am: 2ffab28e -s ours

am skip reason: Merged-In I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277 with SHA-1 d56251ba is already in history

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

Change-Id: Iefbdae04ca71700965ff33da9b31c408b13b9379