Enhance the options check so that if we expect to see a null
options bundle we accept a non-null but empty bundle as well.

Bug: 4182396
Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b
1 file changed