This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
checklist item references. Also add information about alpha/beta
Play Store channel. Reference the design spec for the 6-tap
specification.
bug: 20012569
bug: 20721846
bug: 19702807
Change-Id: Id42b64f36fa837b158f034d8e55f8e6d93709bb0