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

am skip reason: subject contains skip directive

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

Change-Id: Ibbcd15a44af579294b71023c6471a44b5998525f