Merge "Duplicate call of logTapAction from merge" into tm-dev am: b4099182 am: 17929904 am: bf6c2f5f

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



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