[automerger skipped] Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL" am: c6ec27d2d4 am: a7d6573987
am: fb289a0e67 -s ours
am skip reason: change_id Ic814707eb8e95370c659c8bce08386f97769ab90 with SHA1 5cef021df9 is in history

Change-Id: I5889bb968157c1bff1b6af81a7d5897524e63f06