Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
am: af5b90ff45

Change-Id: Ie80bb69b0208dab1e00da76cb60275151a6a5bc7