Merge "Remove mainline settings feature flag." into qt-dev
am: 1ccf640d56

Change-Id: I642d6a843585174895f1673169b1328978770658