[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is...
[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev am: ca53cf7f
am: 08f22c1e -s ours
Change-Id: I028da01c98ba1e1af460b00564849e748ce6d38d