Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e

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

Change-Id: Idd656e3803c247b03808259c582599898c064b27