[automerger skipped] Merge "Merge "Launch help with system default theme" into...

[automerger skipped] Merge "Merge "Launch help with system default theme" into rvc-dev am: 3929ef34 am: 7dff0776" into rvc-d1-dev-plus-aosp am: be407e07 -s ours am: 2ec769a9 -s ours
am skip reason: Change-Id I58bfa6eee8af055d7aacb214b14cb50354a53853 with SHA-1 a3f390f2 is in history

Change-Id: I34a841c0d8afd28c5645e50152ca07927bc235ac