[automerger skipped] Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
am: 0f576c7727
am: fb9ce11def
am: 10b70fb05e
-s ours
am skip reason: Change-Id I714db2a450e34d33e5728cf355136d26bef77e11 with SHA-1 9e1bb0def1
is in history
Change-Id: I8be5a8cdd40b89db3776e5afcc64e12bfe49757e
This commit is contained in: