Merge "Remove word san-ity to follow respectful code" am: ecc411847f am: ba75ae5402 am: ede9a0fed3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1895125

Change-Id: I56c4c918077337a851c269ff761e7f9f890827cc