Merge "Reset message area." into tm-qpr-dev am: 796e1c4c37 am: 5a10a78ec1

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

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