Merge "Update targetSdkVersion to 28" am: 60fe2d90f1
am: d2f6e5953e

Change-Id: I79f3f15e613f05f8af4419d6569f216050dd2b9f