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