Merge "Add ".webp" to default compress extensions" am: bf6a120aaa am: f700df50c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430089

Change-Id: Ibd5aa7d237f4c935ae63b2cce2dcca09f3dc9d89