resolve merge conflicts of ef33f4c1 to tm-dev...

resolve merge conflicts of ef33f4c1 to tm-dev am: 7647712c am: 60361a11 am: 5e55f614

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



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