Merge "Uniform the settings enum proto for accessibility tutorial." into rvc-dev am: 5805bc16 am: 287e9bcc am: aff4ca6e Change-Id: I0977742ec7115bad4d83d9b1bfc5a8cc2be7a1d6