Merge "[automerger skipped] [DO NOT MERGE] Disable swipe down to pull noti shade for Q Merged-In: I74c682d39c70f785777b5a0804b31a0cc2369759 Bug: 136293958 am: 3739fbccdc am: 23f01a3829 -s ours
am: 27b3fa797b -s ours
am skip reason: subject contains skip directive

Change-Id: I3880c020276efc6e82c956f37c80270623a456c3