Merge "Merge "Add support for LearnMore option" into qt-dev am: 775f334fad am: e003684c94" into qt-r1-dev-plus-aosp
am: 60321ad809

Change-Id: Ie271d0673abc79b243b99dc8812b296df47d3bff