[automerger skipped] [MEP] The condition of "null point check" is wrong am:...

[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df691 am: 6a0742b2 am: ffdf3513 -s ours am: d625370f -s ours am: 4be676ee -s ours

am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0 is already in history

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



Change-Id: Ic11a79886b22dc210c0476c9d28cfeda3eb18e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>