Android 12.1.0 release 9
Fix issues caught by Android Lint am: d0d5415ff4 am: fa32132f9a am: 18e63309dd

Original change: https://android-review.googlesource.com/c/platform/external/androidplot/+/1346923

Change-Id: I94c4318c996fb544cea9d2396bf6bf2be61461bf