Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 am: 2368ec9e27 am: 4052d42e8c

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

Change-Id: Ibde2ce8cc39a2b3f564a2c11a85e18a24cce0595