Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03

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

Change-Id: I87b1c44c4fc42d114bbe1bd25b2f3b2475d6c3e2