[conflict] Merge "Re-organize trout BoardConfig.mk" am: 9515bb8ddb

Original change: https://android-review.googlesource.com/c/device/google/trout/+/2323933

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