Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry" am: cf38228e0d am: 414d2a5175 am: a5d6ec9b48

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398e08a596935f5430251ee72038951810c294f9