Merge "Merge "Break infinite recursion in RemoteInputView" into tm-dev am:...

Merge "Merge "Break infinite recursion in RemoteInputView" into tm-dev am: 4e08c381 am: 6052ebe4 am: 759c213f" into tm-qpr-dev-plus-aosp am: a3ff7bf1

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



Change-Id: I3645c7ccd9a8ea5fb57c5b5b204c879f8687e494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>