am ea499450: Reconcile with ics-factoryrom-2-release

* commit 'ea4994501a05defd99ef3599c811959cfe30ef6c':
  Revert "Add event logs for NFC events. DO NOT MERGE"
  Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"