Merge "Add null check for the parameter CallerInfo in onCallerInfoQueryComplete"
am: a96f8a59d2

Change-Id: I4217ec754f27173c583773817e2c0f668020ad23