am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev

* commit 'ae74287e036b432ca394cbc497386547b16c17ff':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]