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

am skip reason: subject contains skip directive

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

Change-Id: I8e587a86023cfdcd30f4dca90f9db20fd8900f02