Merge "Fix "form/from" typos in comments" am: c66a390867 am: 64a23c980f

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

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