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: 0d093f03

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

Change-Id: Idb05f83e60168bd9e542c86cfbd84842c9e6ea12