Merge "Remove accidentally added diff file" into rvc-qpr-dev am: 1ca2a4b1bb am: db8249fd40

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

Change-Id: Ie9d57de8ba5d700aa7a778206a2429b999a6ad10