Merge "Fix a bug where the AiAi service was auto-destroyed due to binder timeout." into tm-dev am: 426cc578 am: 6c757b08

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

Change-Id: I5f6ead815efbcd2eec20efdbebb3db24bdcc7e5c