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

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

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



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