Unifying FallbackNoButton input consumer with OtherActivityInputConsumer using a different handler
am: c127dff181

Change-Id: I89d6e52d58a35f94d03b06e9f54981399d902958