Merge "Fixed typo for isDeclared warning message" am: 6f1de5c160 am: ca9bd2dee7 am: d65788901d

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

Change-Id: I7c2b7dcd5addbb47170445428f4fed4d666229c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>