resolve merge conflicts of c522dc6 to mnc-mr-docs
am: 0cb25d527f

* commit '0cb25d527f4ca81910feb106cca7ca156a34018b':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I24ec45420bab5a346f4d86b7a1a09ed9a3dec67f