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

resolve merge conflicts of ef33f4c1 to tm-dev am: 7647712c am: 03785dc3

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



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