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 am: 07344cd2
Change-Id: I771b145d1b8abaae7a8a1db02f1b71ba87cba305