Merge "Suppress warning on the use of deprecated APIs" am: 6adc1b3ae3 am: 22e1864e27

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1425363

Change-Id: I32cbf3c8e904d7cc928b251a231716e2a92d5104