Merge "Remove usage of optimized reflection getters" am: 9d0bfe1b0a am: f10f3736ea

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

Change-Id: I870f7eee1c5f113b00aa560e4951084be8daf3d5