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

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

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