Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: 7d23920f2b am: c0d9c71791

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207

Change-Id: Iee43e7fcc34efdb0d03b0d13840f527ac0f71d0f