Merge "Reset message area." into tm-qpr-dev am: 796e1c4c

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



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