Merge "Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev am: 503b489384 am: 8b19acac90" into qt-r1-dev-plus-aosp
am: e37e709471

Change-Id: Ie15f305d42f544c02583acd0c612327a5b0dc157