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

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

Change-Id: I960c0685876a3d2f063ea8c1d562fbd0bc1d568b