[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b
am: 6a0742b2fb
am: ffdf3513ec
-s ours am: d625370f83
-s ours
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I0e42a5db8d4449133810982658b8da7c242d82c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: