Merge "Merge "Store ETWS primary information in the database" into rvc-dev am:...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: I8ae56f7385ddd2e9c3cef250e196aa66a28c0ef2