Merge "update inputdelay if changed" am: 4a3734db34 am: bfd43a0edf am: d297b5e672

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2529659

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