Merge "RESTRICT AUTOMERGE Only update native InputApplicationHandle once" am: d14298172c am: a34774edf8

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

Change-Id: Ib9641a6478cb9ef8c1e8d14812741608a6464cff