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

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

Change-Id: Ida4334615ddce79a30548226710287ba0389985c