Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766



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