[automerger skipped] Merge changes from topic "store-interface-stability-aosp"...

[automerger skipped] Merge changes from topic "store-interface-stability-aosp" am: 9759952a -s ours am: 97a19256 -s ours am: b3b57602 -s ours am: b63896a6 -s ours
am: a05b4683 -s ours
am skip reason: change_id Ifd9aa07ae359557ff94b600c1b64bb565be85dc2 with SHA1 7b10226a is in history

Change-Id: I0f9d184d77592c7672f20efa416d83ebbd526f30