Merge "Merge "Reset session for augmented only on manual requests." into...
Merge "Merge "Reset session for augmented only on manual requests." into qt-dev am: 2e45d4fb am: 5570da5e" into qt-r1-dev-plus-aosp
am: c43275a3
Change-Id: I5bedbdf36f6e3e16c615b55cb2d51fa8f30364f7