Merge "Fix typo in module name" am: c88c9c95ec am: d3edfac4bb am: d805f0a6dc am: 477c83130c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1744993

Change-Id: Iccdbb0ccab193ce717ab2c35aac49ccf85ec60df