Merge changes from topic "nfcc_aon_listener" am: 2195e2b514 am: 2f336d3401 am: e3cba3971a

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

Change-Id: I3a234b2714f8254df7f4082b909b1f960b5d03f7