Merge "Merge "Update string for dismiss option in manage menu" into rvc-dev...

Merge "Merge "Update string for dismiss option in manage menu" into rvc-dev am: 75882e42 am: 1c82e750 am: a7da76a5" into rvc-qpr-dev-plus-aosp am: 4c495807

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

Change-Id: I9d075f79e4c91146a43c1be6bc67110003e86236