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

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

Change-Id: Iffdf2d1a95c7fa7f751790d0ca24ef1f662c178d