Fix cases where Policy can be null.

- in one case, where we checked for historical policies that were no
longer supported, we didn't check to see if there was a policy set in
the first place
- in another case, we checked to see if policies were activated, but
again, didn't check to see if any policies were set (passing a null in
that case checked the activation of the *aggregate* policies)

Bug: 4996003
Change-Id: I3c9f201fbe39c1e61e5bc33326e27ad82023b578
1 file changed