Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd am:...

Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd am: 7d00787c am: 9ea22aa5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953



Change-Id: I97d34c84972b219c095e87fe0db61b3114f95104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>