Merge "Fix to launch fdn activity on clicking the fdn preference."
am: 2889b75e4e

Change-Id: I2c789dda35ad34ee445b7394a61950cb8df3ef0f