[automerger skipped] Merge "RESTRICT AUTOMERGE Remove line of code that was mistakently left in." into rvc-qpr-dev am: 90ca9ba531 -s ours am: 74526215ac -s ours am: 36aff0fb3b -s ours am: 33c4ddb16e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4cae6bf7ffa7eed820ad47f226bdf12010a2b03b