[automerger skipped] Merge "Support...

[automerger skipped] Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd8 am: fd947cb0 -s ours

am skip reason: Merged-In I6566cd9d615331a56728613583295637982bcd3f with SHA-1 5adf602e is already in history

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



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