Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee8718 am: de1246acf9 am: 004584f595 am: d7f4ef17e3 am: 861f7670cb
Change-Id: I0c2cb80ca7ed12c0beae0d899d06418b0ef73660
This commit is contained in: