[automerger skipped] Merge "[DO NOT MERGE] fingerprint: handle...

[automerger skipped] Merge "[DO NOT MERGE] fingerprint: handle PerformanceStats NULL pointers" am: e5af1e14 am: 8f1c91da am: f3ec478e am: dc16f770 am: e9e8fb24 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If612f078d13a384182d486591fbee29f6e3a4f24