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

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



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