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

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

Change-Id: Iff8716df4086203ac2a6d4b5e92fe8589cbb4058