Merge "Merge "Hide header if no items present" into rvc-dev am: 729c6c64a9
am: 101209195e" into rvc-d1-dev-plus-aosp am: 537aa07e0e
am: 64ccae57e0
Change-Id: I52b992309073d948efded79afe288467b0fe066a
This commit is contained in: