Merge "Fix summary disappear when scrolling in large text mode" into udc-dev...

Merge "Fix summary disappear when scrolling in large text mode" into udc-dev am: 96d15c46 am: e2eced54

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



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