Merge "BottomSheetDialog is canceled when swiped down" into nyc-mr1-dev
am: 845f379018

Change-Id: I974d79540ddbfeabcb831c85c06839920ab83eab