Merge "Update the documentation for onResume of Activity" into sc-v2-dev am: 026574cca5 am: 7da51f0bb8

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

Change-Id: Ia7eed10550fa8008b6981f3689f0f40be6c08123