fix merge conflict
fix merge conflict

Change-Id: I1a7bf761b2624c918d351c4f157e6745c3f9f540

android/architecture-components-samples,android/architecture-components-samples,b95505017/android-architecture-components,b95505017/android-architecture-components,b95505017/android-architecture-components,android/architecture-components-samples