Merge "Fix settings crash when enhanced notification shown in search results"...

Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev am: 4d4bf61c am: 41e650c2

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



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