Merge "Fix Configuration.diff documentation." am: f822fdf129

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

Change-Id: I1b397e038895c04108cdad48e0fb4ddfd48e0d67