Merge "Fix error prone warnings" am: 8f15a06f5a am: 953a3b3276 am: 2f916f658c am: c7ab3f5e3f

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

Change-Id: I1f202571d03db61cef3e1d4c75412c7d0a79ebaf