Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46

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

Change-Id: I8bcd5f7d301668d7895710b8277be25292456886