Merge "Use Database number even radio indication is not ready am: 3d809f74...
Merge "Use Database number even radio indication is not ready am: 3d809f74 am: dc4c4cb1" into rvc-d1-dev-plus-aosp am: 2996a8bd
Change-Id: I2ad7d6ef80ca22aa4d165099cf0684abf6fa47c0