Merge "[automerger skipped] Merge "DO NOT MERGE Fix Autohide functionality"...

Merge "[automerger skipped] Merge "DO NOT MERGE Fix Autohide functionality" into qt-qpr1-dev am: 2267cbc5 -s ours am: 14862018 am: 322d2763 am: 005699fc" into rvc-qpr-dev-plus-aosp am: 1920bf25 -s ours
am skip reason: subject contains skip directive

Change-Id: I782641e2e5f27ab9e158ef10991c4321ea068ae2