Merge "Move LoggingEvents.java to android-common & add UserHappiness"