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

Change-Id: I054655140dc5e0d750d7ed7cebd46307d11032d9