Merge "Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: a64fc14b85" into rvc-d1-dev-plus-aosp am: 73ae9c4e56 am: 09a9a20d0b

Change-Id: Ib18dd302e7a69cd6797c1e891aca4f9d4ad1fafc