Merge changes from topic 'am-51f46b0037de4a44a6855ff5a0be6dfa' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am: 020212c7 am: ffe4d641
  Add device config to determine when "allow hold" carrier config is used. am: d81c426e am: 6c619a2a
  Merge "Implement new ephemeral resolver design" into nyc-mr1-dev am: 80855e15 am: 22652675
  Implement new ephemeral resolver design am: fea1b776 am: 6485f6ed