Merge "Merge "Improves the REMINDER_EXP mode for Assist Handle behavior" into qt-dev am: 4335d958e4 am: fb95617030" into qt-r1-dev-plus-aosp
am: a839ce7e87

Change-Id: Ie4c8f1d7c17db84fdfbcb12273fcbf1274a1dd53