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: 0fe0c2b3 am: a8018e49

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

Change-Id: Id3c459d0227b9e3ecb0c6d359e587b9cada0f3e9