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

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

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



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