Merge changes from topic "screen_title" into tm-mainline-prod am: 7c46effb

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



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