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: 3412989
Change-Id: I8967b1cd23510cd1b78ac55aef8780f579ed98d3
1 file changed