Merge "Minor cleanups." am: 95f9945cb2 am: bb9fccad96 am: 1bb6270faa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1896828

Change-Id: Iea7a35177d8a7128ff4c73e600ed4a7279faada5