Merge "Fire CB in Location off for requestCellInfoUpdate"
am: 1ba2803e86

Change-Id: I8b3cf7d878f411d54a58141ad33a9cb8954e711f