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

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

Change-Id: I56bc4dbe597bd2f69aaefd7d05caa2abc67c463a