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

Merge "Break infinite recursion in RemoteInputView" into tm-dev am: 4e08c381 am: 4a3fda9e am: 2991309d am: a8408a69

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



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