Merge "Ensure AoD transient messagesa are updated" into tm-qpr-dev am: 4c71a784

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



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