Merge "Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545b am: 74f7d0ff am: 41e385b9" into rvc-qpr-dev-plus-aosp