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

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



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