[automerger skipped] Merge "RESTRICT AUTOMERGE Remove line of code that was...

[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: f3b743c3 -s ours am: 34ddc5df -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic97ea0bc2df3c05ad140a01bb70be758f2cd37c5