Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 77f9237105 am: f723651e86

Change-Id: Ia32f0372918ec957fa3eceeb87694759d1531473
tree: 2fdf6cf3784067f7817ed6313176e58af41fcecf
  1. framework/
  2. service/