Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
am: 8a66dd0357

Change-Id: Ic9f6ec084e99e20fdc9cd1ea2955482709b59fa5