Merge "Merge "Fix testOnReceivedLoginRequest assertion error bug" into lollipop-mr1-cts-dev am: 1bdd3f7a15" into marshmallow-cts-dev am: 71989a6066
am: 9b140bdbc6

Change-Id: Ic462d200227e3bc216281ae8a49b446d0c44118e