[automerger skipped] Merge "Removes a vestigial code path." into qt-dev-plus-aosp
am: 85704005 -s ours
am skip reason: change_id I994379b2c2da7d0d1fb47907f00229bfc92328c3 with SHA1 ca848c47 is in history
Change-Id: Ib647d72e530501e7cc64b3329fd9f10abde4e365