Merge "Fix some typos in NMS." into udc-dev am: 8d3f664d30

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

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