[automerger skipped] Merge "Settings: Fix FC when learn more textview help...

[automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e81596 am: 6040d46c am: 3210089f -s ours am: df5a05a7 -s ours

am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121

Change-Id: Ic2a0651aa5f77910fce7b7d63a09a24b6e18b674