Merge "Addressing CL feedback." into tm-dev am: 4ced90c3 am: 30375852

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



Change-Id: I6f45f1e82d4f5cccaa89f980f4cdf4f8ca664d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>