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

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



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