[automerger skipped] Merge "Add suppressLintAnnotation on state.java" am:...

[automerger skipped] Merge "Add suppressLintAnnotation on state.java" am: 0fa9d2ef -s ours am: 55d23401 -s ours am: b4e5175b -s ours

am skip reason: Merged-In I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f with SHA-1 4acdb1be is already in history

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

Change-Id: I554c0189ea4d46f45f28c3510bd692a7d90726e2