Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 30375852fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383 Change-Id: If643bc5c7a65c58faa194109d3b027b13abd3f5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: