[automerger skipped] Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e am: 1c505e8cda am: 59d98a07a9 -s ours

am skip reason: Change-Id I6d5df95cfca2950ea86872d2f0afc1ba828841dc with SHA-1 1394a019e7 is in history

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

Change-Id: I64bd5ddef60555447dc9953f6208d22fd9ba1f53