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

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



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