Merge "Fix warnings from static analysis tool." am: 7464e441 am: cbd6a61f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2519737



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