Merge "Relax policy for non-dismissible calls am: 5ec7baf0 am: b0361e14 am: 99460de0" into udc-qpr-dev-plus-aosp