[automerger skipped] Merge "Add suppressLintAnnotation on state.java" am: 0fa9d2ef6b -s ours
am skip reason: Merged-In I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f with SHA-1 4acdb1beff is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818911
Change-Id: Icf68f1065dcb10b93d4ad984bcc9d7c1964a9bfa
This commit is contained in: