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

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

Change-Id: I4d1621a8681c741baf32e8108a6f7ce6945beb68