[automerger skipped] Merge "Allow validation when switching data back from...
[automerger skipped] Merge "Allow validation when switching data back from CBRS to primary." am: feca2ba1
am: 1c84a5b4 -s ours
am skip reason: change_id I7d92601cdb42e87afb9b255f907562644ce9956c with SHA1 4c7d2b5c is in history
Change-Id: I7ee199b45d63fdfc9ea9d9458baab95982e8c0e5