Merge changes from topic "am-74b4885ebe3c49aea524226e5bda8731" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d53 -s ours am: 486bb250 -s ours am: 813b3191 -s ours
  [automerger skipped] Remove VibrationEffect javadocs to methods not available in public APIs. am: 1c36dbb3 -s ours am: 60a3635f -s ours am: bc586013 -s ours