[automerger skipped] Remove qsDataType since it was the same as dataType am: 0b90863da9 am: 9688a8e3d6 -s ours
am skip reason: Merged-In I5e2eb4896966516f34980863e18b99368f395b20 with SHA-1 225506a6a0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740840
Change-Id: I8e9817d912c9a977343ead2a6de2497d68ab59c9
This commit is contained in: