Merge "Create a valid TYPE for the NOTIFICATION_ASSISTANT_ADJUSTMENT Tron log...

Merge "Create a valid TYPE for the NOTIFICATION_ASSISTANT_ADJUSTMENT Tron log message, and switch the code to use it.  Using the same enum value as before to avoid a discontinuity in the logs."