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: I09cf0deff3af7c6766a0107ad21f13fca8d3ba49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>