Merge "Add timeout for displaying 5G icon in SystemUI" into qt-qpr1-dev
am: 6eb9ba375b

Change-Id: I49c19b44316a0ecd4d8decf0f4887b77ae54490f