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

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

Change-Id: Ib8813180543283bc7568cf0f2b74353cfc8887d4