Android 12.1.0 release 23
Fix issues caught by Android Lint am: d0d5415ff4 am: fa32132f9a am: 18e63309dd am: 162b53f9d2

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

Change-Id: Ic03c57344068501417054a98e06f4d117e83456a