[automerger skipped] Merge "Keep error message notification after stop" into rvc-dev am: a00573e0c8 -s ours
am skip reason: Change-Id I5fdbcaf5ed28343f53d66b3f02ccb66d3c7920ff with SHA-1 7ba4d3945a is in history

Change-Id: I365e25e3c7a534f0d11e488d098f12b3b9ce13dc