Merge "[automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73 am: 786abd27cb -s ours" into rvc-qpr-dev-plus-aosp