[automerger skipped] Merge "Fix typo in NPMS dump" into main am: 245dead4 am: 7557bba3 -s ours

am skip reason: Merged-In Iaee24f08b78fa28c0056aaeea9d655c33793aec8 with SHA-1 f1ba0838 is already in history

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



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