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

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



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