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: 2b41ef77 am: fc5ac8d1

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



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