Merge "Fix inline autofill not working if both afservice and keyboard support...

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

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

Change-Id: Ie80cc30d38a3eb19ca3328a0238ab61106a2a01d