[automerger skipped] DO NOT MERGE Removed unused priority argument am: 7113328b53 am: 04f4c46b81 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib0c024175de43397a83af1ad28d342ba51b07f53