Guard CDS settings against USER_NULL

Bug: 129421955
Test: manual
Change-Id: I25b2255d903a5448cfee1e24e03ac75652ce7733
(cherry picked from commit 8f4a54c693968c2e07f8fdd23ffe509a8bd1b703)
1 file changed