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