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