9683f990a2
Also update CallerInfo and CallerInfoAsyncQuery to use the new method. Bug: 5247602 Change-Id: I2bbb0806ad2787d53b19bc1e9bdfb0ee8be26980