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

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



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