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

Change-Id: Id9dbf15d3c6e20b3c16c206c61ae00bd62994c40