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

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

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



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