am 58248d04: Merge "Update drawables to fix CTS test failures" into lmp-preview-dev

* commit '58248d049e8b17dd60e4e94e784c09b00e0a7e9d':
  Update drawables to fix CTS test failures