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: I146bf4dea15d7e958d1ad48055d7352afae01282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>