Merge "Merge "Hide empty text view when airplane mode" into rvc-dev am: 589c5c5571 am: b59133dc99" into rvc-d1-dev-plus-aosp am: eb09a9a675 am: 2a111c54c6

Change-Id: Id9aa67c01731b89c4b248bf9cae4f0b92655f539