[conflict] Merge changes Iee97d469,Ica1b552a into tm-dev am: 50f19f21 am: 9d9bf2b9

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



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