Merge changes from topic "revert-13738532-client_suggestions_fillrequest-sc-dev-EQZRQWLQUO" into sc-dev am: 214e26ec am: d380237a

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

Change-Id: I7a4a20ce889c7b952b5c4c70550bbc54071e503c