am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev

* commit 'aa474ff0f3bf68110dc60f9472c062ff1a4a44ae':
  LayoutLib: Fix EditText rendering [DO NOT MERGE]