Merge "Updating accessibility content for buttons in SysUI for captions" into qt-dev
am: 6a4bf6a397

Change-Id: I87296b91a9d35f445663861c89a8e1ee2368cdf3