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

Change-Id: I55fb5742623169a866a2a40dc1a21a29ed595894