Merge "Update terms" am: 2c2cf2386b

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1376806

Change-Id: I7603ed6311050ff59709d2858884b34e31328135