Merge "Enable the System Navigation settings page in AOSP" into rvc-dev am: 49afa94de7

Change-Id: I11dcf77f0d6c1c3bd6c6162ec2caf56a396a9a00