Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a am:...

Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a am: 992d61b4 am: 8766d483 am: cc4d2be9 am: 1ef1d167

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



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