Merge "Remove dependencies on art-notices jar" am: 69063e8646 am: a3d2533234

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

Change-Id: Iec8c336beca2fb4a58ecb5aab0578eda35c82b75