Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a70 am: 992d61b4ec am: 8766d48380

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

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