Merge "Extend the max count for retrying to request DirectActions to 7." into tm-dev am: fcf090345b am: cc83c18df3

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

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