Merge "Fix crash on "Connection preferences"" into android10-gsi