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

Merge "Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd" into tm-dev-plus-aosp am: 119f9993

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



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