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

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

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