Merge "Add ResultPayload for always-on ambient display. am: eb1a45b95b am: cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
am: 867ee49254 -s ours
Change-Id: Ibb7dee38be7424883002939aae5fe6f3c3d17ff4
This commit is contained in: